Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-08 22:36:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: csf

Browse Source
This commit is contained in:
Usman Nasir
2020-01-03 16:24:28 +05:00
parent c16661abef
commit 77e453f252
6 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CLScript/CLMain.py
View File

@@ -5,7 +5,7 @@ class CLMain():
self.path = '/usr/local/CyberCP/version.txt' self.path = '/usr/local/CyberCP/version.txt'
#versionInfo = json.loads(open(self.path, 'r').read()) #versionInfo = json.loads(open(self.path, 'r').read())
self.version = '1.9' self.version = '1.9'
self.build = '2' self.build = '3'
ipFile = "/etc/cyberpanel/machineIP" ipFile = "/etc/cyberpanel/machineIP"
f = open(ipFile) f = open(ipFile)

5
firewall/firewallManager.py
View File

@@ -1325,6 +1325,11 @@ class FirewallManager:
else: else:
return ACLManager.loadErrorJson('installStatus', 0) return ACLManager.loadErrorJson('installStatus', 0)
if os.path.exists('/usr/local/CyberCP/bin/python3'):
final_dic = {'installStatus': 0, 'error_message': 'CSF is not yet supported on Python 3'}
final_json = json.dumps(final_dic)
return HttpResponse(final_json)
execPath = "sudo /usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/csf.py" execPath = "sudo /usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/csf.py"
execPath = execPath + " installCSF" execPath = execPath + " installCSF"

2
loginSystem/views.py
View File

@@ -223,7 +223,7 @@ def loadLoginPage(request):
firstName="Cyber",lastName="Panel", acl=acl, token=token) firstName="Cyber",lastName="Panel", acl=acl, token=token)
admin.save() admin.save()
vers = version(currentVersion="1.9", build=1) vers = version(currentVersion="1.9", build=3)
vers.save() vers.save()
package = Package(admin=admin, packageName="Default", diskSpace=1000, package = Package(admin=admin, packageName="Default", diskSpace=1000,

2
plogical/adminPass.py
View File

@@ -32,7 +32,7 @@ def main():
firstName="Cyber", lastName="Panel", acl=acl, token=token) firstName="Cyber", lastName="Panel", acl=acl, token=token)
admin.save() admin.save()
vers = version(currentVersion="1.9", build=2) vers = version(currentVersion="1.9", build=3)
vers.save() vers.save()
package = Package(admin=admin, packageName="Default", diskSpace=1000, package = Package(admin=admin, packageName="Default", diskSpace=1000,

1
preUpgrade.sh
View File

@@ -94,6 +94,7 @@ cp lswsgi /usr/local/CyberCP/bin/
## ##
sed -i 's|import views|from . import views|g' /usr/local/CyberCP/configservercsf/urls.py
systemctl restart lscpd systemctl restart lscpd
echo "###################################################################" echo "###################################################################"

2
version.txt
View File

@@ -1 +1 @@
{"version":"1.9","build":2} {"version":"1.9","build":3}