From 13e51d76f318c1353d6faef508202acc736d5c37 Mon Sep 17 00:00:00 2001 From: usmannasir Date: Thu, 3 Oct 2024 10:46:18 +0500 Subject: [PATCH] putting back csf, ref https://github.com/usmannasir/cyberpanel/issues/1328 --- plogical/csf.py | 7 +++---- plogical/upgrade.py | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plogical/csf.py b/plogical/csf.py index 3bc19ad83..872857ba4 100755 --- a/plogical/csf.py +++ b/plogical/csf.py @@ -1,5 +1,6 @@ #!/usr/local/CyberCP/bin/python import sys + sys.path.append('/usr/local/CyberCP') from plogical import CyberCPLogFileWriter as logging import subprocess @@ -51,10 +52,8 @@ def installCSF(): os.chdir('csf') - ### manually update csf views.py because it does not load CyberPanel properly in default configurations - content = ''' # -*- coding: utf-8 -*- from __future__ import unicode_literals @@ -417,10 +416,8 @@ def configservercsfiframe(request): command = 'csf -ra' ProcessUtilities.normalExecutioner(command) - ##### update csf views file - logging.CyberCPLogFileWriter.statusWriter(CSF.installLogPath, 'CSF successfully Installed.[200]\n', 1) try: @@ -435,6 +432,8 @@ def configservercsfiframe(request): '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', + 'sed -i -E "s/from.*, response/from plogical.httpProc import httpProc/g" /usr/local/CyberCP/configservercsf/views.py' + '''sed -i -E "s#^(\s*)return render.*index\.html.*#\1proc = httpProc(request, 'configservercsf/index.html', None, 'admin')\n\1return proc.render()#g" /usr/local/CyberCP/configservercsf/views.py''' 'killall lswsgi' ] diff --git a/plogical/upgrade.py b/plogical/upgrade.py index a86f31f9d..abd7f4a6f 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -3552,6 +3552,8 @@ def upgrade(branch): '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', + 'sed -i -E "s/from.*, response/from plogical.httpProc import httpProc/g" /usr/local/CyberCP/configservercsf/views.py' + '''sed -i -E "s#^(\s*)return render.*index\.html.*#\1proc = httpProc(request, 'configservercsf/index.html', None, 'admin')\n\1return proc.render()#g" /usr/local/CyberCP/configservercsf/views.py''' 'killall lswsgi' ]