mirror
/
cyberpanel
mirror of https://github.com/usmannasir/cyberpanel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

putting back csf, ref https://github.com/usmannasir/cyberpanel/issues/1328

This commit is contained in:
usmannasir 2024-10-03 10:46:18 +05:00
parent c32ac4b1c9
commit 13e51d76f3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plogical/csf.py
View File

@ -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 @@ class CSF(multi.Thread):
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'
]

2
plogical/upgrade.py
View File

@ -3552,6 +3552,8 @@ pm.max_spare_servers = 3
'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'
]