bug fix: csf

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)

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"
 

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,

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,

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 "###################################################################"

version.txt

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