From 0e47808bf06f3fd58d884c8ce49182233bc24015 Mon Sep 17 00:00:00 2001 From: qtwrk Date: Thu, 26 Mar 2020 13:34:41 +0100 Subject: [PATCH] recent update --- cyberpanel.sh | 22 +++++++++++----------- cyberpanel_utility.sh | 2 +- faq.sh | 2 +- install/install.py | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cyberpanel.sh b/cyberpanel.sh index d657d3e39..e4f12f4ec 100644 --- a/cyberpanel.sh +++ b/cyberpanel.sh @@ -429,11 +429,11 @@ if [[ $SERVER_OS == "CentOS" ]] ; then yum install epel-release -y if [[ $CENTOS_8 == "False" ]] ; then - yum install -y wget strace htop net-tools telnet curl which bc telnet htop libevent-devel gcc python-devel libattr-devel xz-devel gpgme-devel mariadb-devel curl-devel python-pip git + yum install -y wget strace htop net-tools telnet curl which bc telnet htop libevent-devel gcc python-devel libattr-devel xz-devel gpgme-devel mariadb-devel curl-devel python-pip git socat check_return fi if [[ $CENTOS_8 == "True" ]] ; then - yum install -y wget strace htop net-tools telnet curl which bc telnet htop libevent-devel gcc libattr-devel xz-devel mariadb-devel curl-devel git platform-python-devel tar + yum install -y wget strace htop net-tools telnet curl which bc telnet htop libevent-devel gcc libattr-devel xz-devel mariadb-devel curl-devel git platform-python-devel tar socat check_return dnf --enablerepo=PowerTools install gpgme-devel -y check_return @@ -467,7 +467,7 @@ fi if [[ $SERVER_OS == "Ubuntu" ]] ; then apt update -y DEBIAN_FRONTEND=noninteractive apt upgrade -y - DEBIAN_FRONTEND=noninteracitve apt install -y htop telnet python-mysqldb python-dev libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev python-gpg python python-minimal python-setuptools virtualenv python-dev python-pip git + DEBIAN_FRONTEND=noninteracitve apt install -y htop telnet python-mysqldb python-dev libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev python-gpg python python-minimal python-setuptools virtualenv python-dev python-pip git socat vim check_return if [[ $DEV == "ON" ]] ; then DEBIAN_FRONTEND=noninteractive apt install -y python3-pip @@ -681,20 +681,18 @@ fi show_help() { echo -e "\nCyberPanel Installer Script Help\n" -echo -e "\nUsage: wget https://cyberpanel.sh/cyberpanel.sh" -echo -e "\nchmod +x cyberpanel.sh" -echo -e "\n./cyberpanel.sh -v ols/SERIAL_NUMBER -c 1 -a 1" +echo -e "\nUsage: sh <(curl cyberpanel.sh) --argument" echo -e "\n -v or --version: choose to install CyberPanel OpenLiteSpeed or CyberPanel Enterprise, available options are \e[31mols\e[39m and \e[31mSERIAL_NUMBER\e[39m, default ols" echo -e "\n Please be aware, this serial number must be obtained from LiteSpeed Store." echo -e "\n And if this serial number has been used before, it must be released/migrated in Store first, otherwise it will fail to start." -echo -e "\n -a or --addons: install addons: memcached, redis, PHP extension for memcached and redis, 1 for install addons, 0 for not to install, default 0, only applicable for CentOS system." -echo -e "\n -p or --password: set password of new installation, empty for default 1234567, [r] or [random] for randomly generated 16 digital password, any other value besdies [d] and [r(andom)] will be accept as password, default use 1234567." +echo -e "\n -a or --addons: install addons: memcached, redis, PHP extension for memcached and redis" +echo -e "\n -p or --password: set password of new installation, empty for default 1234567, [r] or [random] for randomly generated 16 digital password, any other value besides [d] and [r(andom)] will be accept as password, default use 1234567." echo -e "\n -m: set to minimal mode which will not install PowerDNS, Pure-FTPd and Postfix" echo -e "\n Example:" -echo -e "\n ./cyberpanel.sh -v ols -p r or ./cyberpanel.sh --version ols --password random" +echo -e "\n sh <(curl cyberpanel.sh) -v ols -p r or ./cyberpanel.sh --version ols --password random" echo -e "\n This will install CyberPanel OpenLiteSpeed and randomly generate the password." -echo -e "\n ./cyberpanel.sh default" -echo -e "\n This will install everything default , which is OpenLiteSpeed and nothing more.\n" +echo -e "\n sh <(curl cyberpanel.sh) -v LICENSE_KEY -a -p my_pass_word" +echo -e "\n This will install LiteSpeed Enterise , replace LICENSE_KEY to actual license key and set password to my_pass_word\n" } license_input() { @@ -1469,6 +1467,8 @@ else ADMIN_PASS="1234567" elif [[ "${1}" == 'r' ]] || [[ $1 == 'random' ]] ; then ADMIN_PASS=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 16 ; echo '') + elif [[ ${1} == "d" ]] ; then + ADMIN_PASS="1234567" else if [ ${#1} -lt 8 ] ; then echo -e "\nPassword lenth less than 8 digital, please choose a more complicated password.\n" diff --git a/cyberpanel_utility.sh b/cyberpanel_utility.sh index edbd9b561..129fa710b 100644 --- a/cyberpanel_utility.sh +++ b/cyberpanel_utility.sh @@ -155,7 +155,7 @@ exit show_help() { echo -e "\nFetching information...\n" -curl --silent https://cyberpanel.sh/misc/faq.sh | sudo -u nobody bash +curl --silent https://cyberpanel.sh/misc/faq.sh | sudo -u nobody bash | less -r exit } diff --git a/faq.sh b/faq.sh index 519e6389d..fafc2e6c4 100644 --- a/faq.sh +++ b/faq.sh @@ -10,7 +10,7 @@ NC='\033[0m' # No Color #${RED}text${NC} #${GREEN} ${BLUE} - +echo -e "Use Up/Down Arrow key to navigate\n" echo -e "Frequently Asked Question ${PURPLE}1.${NC} How to reset CyberPanel admin password? diff --git a/install/install.py b/install/install.py index d06c6ce82..3229c3fbf 100755 --- a/install/install.py +++ b/install/install.py @@ -706,7 +706,7 @@ class preFlightsChecks: preFlightsChecks.call(command, self.distro, '[download_install_phpmyadmin]', command, 1, 0, os.EX_OSERR) - command = 'mv /usr/local/CyberCP/public/phpMyAdmin-5.0.0-all-languages /usr/local/CyberCP/public/phpmyadmin' + command = 'mv /usr/local/CyberCP/public/phpMyAdmin-*-all-languages /usr/local/CyberCP/public/phpmyadmin' preFlightsChecks.call(command, self.distro, '[download_install_phpmyadmin]', command, 1, 0, os.EX_OSERR)