Merge branch 'v2.3.9-dev' into v2.3.9

usmannasir · Mar 8, 2025 · c91d708 · c91d708
2 parents 4864980 + f58fef2
commit c91d708
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git 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"

diff --git a/plogical/upgrade.py b/plogical/upgrade.py
@@ -3475,9 +3475,9 @@ def upgrade(branch):
 
         ##
 
-        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()
@@ -3609,12 +3609,12 @@ def restore_files():
             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"
+            execPath = "sudo /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/csf.py"
+            execPath = execPath + " installCSF"
 
             # Restore the files
             print("Restoring files...")