From 538b11d3ebc4b70c10a7dc920828f639405b3a17 Mon Sep 17 00:00:00 2001 From: usmannasir Date: Sat, 8 Mar 2025 03:38:26 +0500 Subject: [PATCH 1/4] remove csf install test --- cyberpanel_upgrade.sh | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh index 23de4d9cf..c9d8ea79b 100644 --- a/cyberpanel_upgrade.sh +++ b/cyberpanel_upgrade.sh @@ -16,6 +16,23 @@ Sudo_Test=$(set) Set_Default_Variables() { + +#### this is temp code for csf + +rm -Rfv /usr/local/CyberCP/configservercsf +rm -fv /home/cyberpanel/plugins/configservercsf +rm -Rfv /usr/local/CyberCP/public/static/configservercsf + +sed -i "/configservercsf/d" /usr/local/CyberCP/CyberCP/settings.py +sed -i "/configservercsf/d" /usr/local/CyberCP/CyberCP/urls.py +if [ ! -e /etc/cxs/cxs.pl ]; then + sed -i "/configserver/d" /usr/local/CyberCP/baseTemplate/templates/baseTemplate/index.html +fi +#systemctl restart lscpd +### this is temp code for csf + + + export LC_CTYPE=en_US.UTF-8 echo -e "\nFetching latest data from CyberPanel server...\n" echo -e "This may take few seconds..." @@ -894,21 +911,6 @@ systemctl restart lscpd Post_Install_Display_Final_Info() { -#### this is temp code for csf - -rm -Rfv /usr/local/CyberCP/configservercsf -rm -fv /home/cyberpanel/plugins/configservercsf -rm -Rfv /usr/local/CyberCP/public/static/configservercsf - -sed -i "/configservercsf/d" /usr/local/CyberCP/CyberCP/settings.py -sed -i "/configservercsf/d" /usr/local/CyberCP/CyberCP/urls.py -if [ ! -e /etc/cxs/cxs.pl ]; then - sed -i "/configserver/d" /usr/local/CyberCP/baseTemplate/templates/baseTemplate/index.html -fi -#systemctl restart lscpd -### this is temp code for csf - - Panel_Port=$(cat /usr/local/lscp/conf/bind.conf) if [[ $Panel_Port = "" ]] ; then Panel_Port="8090" From 0606d2a54e23e62fdc35a71b0e3ace88f1d42c87 Mon Sep 17 00:00:00 2001 From: usmannasir Date: Sat, 8 Mar 2025 03:42:58 +0500 Subject: [PATCH 2/4] remove csf install test --- plogical/upgrade.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 70a762b57..612354c39 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -3605,9 +3605,9 @@ pm.max_spare_servers = 3 print("Backing up files...") backup_files() - # execPath = "sudo /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/csf.py" - # execPath = execPath + " removeCSF" - # Upgrade.executioner(execPath, 'fix csf if there', 0) + execPath = "sudo /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/csf.py" + execPath = execPath + " removeCSF" + Upgrade.executioner(execPath, 'fix csf if there', 0) # execPath = "sudo /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/csf.py" # execPath = execPath + " installCSF" From 71962143bc180ee2a57bde242744588fe1de523c Mon Sep 17 00:00:00 2001 From: usmannasir Date: Sat, 8 Mar 2025 14:17:11 +0500 Subject: [PATCH 3/4] remove csf install test --- plogical/upgrade.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 612354c39..039068a32 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -3609,8 +3609,8 @@ pm.max_spare_servers = 3 execPath = execPath + " removeCSF" Upgrade.executioner(execPath, 'fix csf if there', 0) - # execPath = "sudo /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/csf.py" - # execPath = execPath + " installCSF" + execPath = "sudo /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/csf.py" + execPath = execPath + " installCSF" # Restore the files print("Restoring files...") From f58fef2934b07a08205d192d3807024c44f79f57 Mon Sep 17 00:00:00 2001 From: usmannasir Date: Sat, 8 Mar 2025 14:27:10 +0500 Subject: [PATCH 4/4] remove csf install test --- plogical/upgrade.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 039068a32..dc093c725 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -3471,9 +3471,9 @@ pm.max_spare_servers = 3 ## - execPath = "sudo /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/csf.py" - execPath = execPath + " removeCSF" - Upgrade.executioner(execPath, 'fix csf if there', 0) + # execPath = "sudo /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/csf.py" + # execPath = execPath + " removeCSF" + # Upgrade.executioner(execPath, 'fix csf if there', 0) Upgrade.downloadAndUpgrade(versionNumbring, branch) versionNumbring = Upgrade.downloadLink()