From d5c2e46cd02c7683443d9bd2e84048665aa3c875 Mon Sep 17 00:00:00 2001 From: usmannasir Date: Wed, 2 Oct 2024 16:10:23 +0500 Subject: [PATCH] putting back csf, ref https://github.com/usmannasir/cyberpanel/issues/1328 --- plogical/upgrade.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/plogical/upgrade.py b/plogical/upgrade.py index c5fc57797..a5bfb70f7 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -3543,9 +3543,23 @@ def upgrade(branch): except: pass - #command = 'csf -uf' - command = '/etc/csf/uninstall.sh' + command = 'csf -uf' Upgrade.executioner(command, 'fix csf if there', 0) + + sed_commands = [ + 'sed -i "s/url(r\'^configservercsf/path(\'configservercsf/g" /usr/local/CyberCP/CyberCP/urls.py', + 'sed -i "s/from django.conf.urls import url/from django.urls import path/g" /usr/local/CyberCP/configservercsf/urls.py', + 'sed -i "s/import signals/import configservercsf.signals/g" /usr/local/CyberCP/configservercsf/apps.py', + 'sed -i "s/url(r\'^$\'/path(\'\'/g" /usr/local/CyberCP/configservercsf/urls.py', + 'sed -i "s|url(r\'^iframe/$\'|path(\'iframe/\'|g" /usr/local/CyberCP/configservercsf/urls.py', + 'killall lswsgi' + ] + + for cmd in sed_commands: + Upgrade.executioner(command, 'fix csf if there', 0) + + + command = 'systemctl stop cpssh' Upgrade.executioner(command, 'fix csf if there', 0) Upgrade.AutoUpgradeAcme()