From d42fc5f92de48e1e5cbfc2380b57eba343873d4a Mon Sep 17 00:00:00 2001 From: qtwrk Date: Thu, 26 Mar 2020 15:21:12 +0100 Subject: [PATCH 1/4] update faq --- faq.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/faq.sh b/faq.sh index fafc2e6c4..f422db332 100644 --- a/faq.sh +++ b/faq.sh @@ -11,6 +11,7 @@ NC='\033[0m' # No Color #${GREEN} ${BLUE} echo -e "Use Up/Down Arrow key to navigate\n" +echo -e "press ${RED}q${NC} to exit\n" echo -e "Frequently Asked Question ${PURPLE}1.${NC} How to reset CyberPanel admin password? From 3221e7e97ab4a996bdba242b67d228febe356678 Mon Sep 17 00:00:00 2001 From: Muttahir Aon Syed Date: Thu, 16 Apr 2020 18:40:58 +0500 Subject: [PATCH 2/4] PureFtpd-fix --- install/installCyberPanel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py index 46e1734bf..4cbfc2c9e 100755 --- a/install/installCyberPanel.py +++ b/install/installCyberPanel.py @@ -446,10 +446,10 @@ class InstallCyberPanel: command = 'echo "40110 40210" > /etc/pure-ftpd/conf/PassivePortRange' subprocess.call(command, shell=True) - command = 'wget http://mirrors.kernel.org/ubuntu/pool/universe/p/pure-ftpd/pure-ftpd-common_1.0.47-3_all.deb' + command = 'wget http://mirrors.kernel.org/ubuntu/pool/universe/p/pure-ftpd/pure-ftpd-common_1.0.47-3build1_all.deb' install.preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR) - command = 'wget http://mirrors.kernel.org/ubuntu/pool/universe/p/pure-ftpd/pure-ftpd-mysql_1.0.47-3_amd64.deb' + command = 'wget http://mirrors.kernel.org/ubuntu/pool/universe/p/pure-ftpd/pure-ftpd-mysql_1.0.47-3build1_amd64.deb' install.preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR) command = 'dpkg --install --force-confold pure-ftpd-common_1.0.47-3_all.deb' From cd869d814ba3b71d93ee0fda76a6c724f73d43c6 Mon Sep 17 00:00:00 2001 From: Muttahir Aon Syed Date: Thu, 16 Apr 2020 20:14:41 +0500 Subject: [PATCH 3/4] Update installCyberPanel.py --- install/installCyberPanel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py index 4cbfc2c9e..c3e101573 100755 --- a/install/installCyberPanel.py +++ b/install/installCyberPanel.py @@ -446,10 +446,10 @@ class InstallCyberPanel: command = 'echo "40110 40210" > /etc/pure-ftpd/conf/PassivePortRange' subprocess.call(command, shell=True) - command = 'wget http://mirrors.kernel.org/ubuntu/pool/universe/p/pure-ftpd/pure-ftpd-common_1.0.47-3build1_all.deb' + command = 'wget https://ubuntu.cyberpanel.net/pool/main/p/pure-ftpd/pure-ftpd-common_1.0.47-3_all.deb' install.preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR) - command = 'wget http://mirrors.kernel.org/ubuntu/pool/universe/p/pure-ftpd/pure-ftpd-mysql_1.0.47-3build1_amd64.deb' + command = 'wget https://ubuntu.cyberpanel.net/pool/main/p/pure-ftpd/pure-ftpd-common_1.0.47-3_all.deb' install.preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR) command = 'dpkg --install --force-confold pure-ftpd-common_1.0.47-3_all.deb' From 9db19454a8a56e89fa9fe62036a32a427d5d8bfc Mon Sep 17 00:00:00 2001 From: qtwrk Date: Sat, 18 Apr 2020 20:35:19 +0200 Subject: [PATCH 4/4] more clear wanring for sudo --- cyberpanel.sh | 2 +- cyberpanel_upgrade.sh | 2 +- cyberpanel_utility.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cyberpanel.sh b/cyberpanel.sh index e4f12f4ec..a52fb8de5 100644 --- a/cyberpanel.sh +++ b/cyberpanel.sh @@ -631,7 +631,7 @@ check_root() { echo -e "\nChecking root privileges...\n" if echo $SUDO_TEST | grep SUDO > /dev/null ; then echo -e "\nYou are using SUDO , please run as root user...\n" - echo -e "If you don't have direct access to root user, please run \e[31msudo su -\e[39m command and then run installation command again." + echo -e "\nIf you don't have direct access to root user, please run \e[31msudo su -\e[39m command (do NOT miss the \e[31m-\e[39m at end or it will fail) and then run installation command again." exit fi diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh index 41004b66a..750f1b224 100644 --- a/cyberpanel_upgrade.sh +++ b/cyberpanel_upgrade.sh @@ -109,7 +109,7 @@ check_root() { echo -e "\nChecking root privileges...\n" if echo $SUDO_TEST | grep SUDO > /dev/null ; then echo -e "\nYou are using SUDO , please run as root user...\n" - echo -e "If you don't have direct access to root user, please run \e[31msudo su -\e[39m command and then run upgrade command again." + echo -e "\nIf you don't have direct access to root user, please run \e[31msudo su -\e[39m command (do NOT miss the \e[31m-\e[39m at end or it will fail) and then run upgrade command again." exit fi diff --git a/cyberpanel_utility.sh b/cyberpanel_utility.sh index 129fa710b..3db86efa4 100644 --- a/cyberpanel_utility.sh +++ b/cyberpanel_utility.sh @@ -360,7 +360,7 @@ sudo_check() { echo -e "\nChecking root privileges..." if echo $SUDO_TEST | grep SUDO > /dev/null ; then echo -e "\nYou are using SUDO , please run as root user..." - echo -e "If you don't have direct access to root user, please run \e[31msudo su -\e[39m command and then run installation command again." + echo -e "\nIf you don't have direct access to root user, please run \e[31msudo su -\e[39m command (do NOT miss the \e[31m-\e[39m at end or it will fail) and then run utility command again." exit fi