diff --git a/CLScript/CLMain.py b/CLScript/CLMain.py index 480e7c325..26f64fed1 100644 --- a/CLScript/CLMain.py +++ b/CLScript/CLMain.py @@ -5,7 +5,7 @@ class CLMain(): self.path = '/usr/local/CyberCP/version.txt' #versionInfo = json.loads(open(self.path, 'r').read()) self.version = '1.9' - self.build = '2' + self.build = '3' ipFile = "/etc/cyberpanel/machineIP" f = open(ipFile) diff --git a/firewall/firewallManager.py b/firewall/firewallManager.py index 9994fa9d5..6bd0102cf 100755 --- a/firewall/firewallManager.py +++ b/firewall/firewallManager.py @@ -1325,6 +1325,11 @@ class FirewallManager: else: 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 = execPath + " installCSF" diff --git a/loginSystem/views.py b/loginSystem/views.py index d851fbbd3..1a42e83f0 100755 --- a/loginSystem/views.py +++ b/loginSystem/views.py @@ -223,7 +223,7 @@ def loadLoginPage(request): firstName="Cyber",lastName="Panel", acl=acl, token=token) admin.save() - vers = version(currentVersion="1.9", build=1) + vers = version(currentVersion="1.9", build=3) vers.save() package = Package(admin=admin, packageName="Default", diskSpace=1000, diff --git a/plogical/adminPass.py b/plogical/adminPass.py index 4d7484aa9..d7036e390 100755 --- a/plogical/adminPass.py +++ b/plogical/adminPass.py @@ -32,7 +32,7 @@ def main(): firstName="Cyber", lastName="Panel", acl=acl, token=token) admin.save() - vers = version(currentVersion="1.9", build=2) + vers = version(currentVersion="1.9", build=3) vers.save() package = Package(admin=admin, packageName="Default", diskSpace=1000, diff --git a/preUpgrade.sh b/preUpgrade.sh index 7e31222a9..e1c4df519 100644 --- a/preUpgrade.sh +++ b/preUpgrade.sh @@ -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 echo "###################################################################" diff --git a/version.txt b/version.txt index 1c0bded6a..01800db5a 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -{"version":"1.9","build":2} \ No newline at end of file +{"version":"1.9","build":3} \ No newline at end of file