Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-07-06 05:18:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

p3

Browse Source
This commit is contained in:
Usman Nasir
2019-12-10 15:09:10 +05:00
parent d0dc397463
commit 5e7aeeb597
231 changed files with 1698 additions and 1697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plogical/sslUtilities.py
View File

@@ -28,11 +28,11 @@ class sslUtilities:
if items.find("}") > -1:
return 0
if items.find(virtualHostName) > -1 and sslCheck == 1:
data = filter(None, items.split(" "))
data = [_f for _f in items.split(" ") if _f]
if data[1] == virtualHostName:
return 1
except BaseException,msg:
except BaseException as msg:
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [IO Error with main config file [checkIfSSLMap]]")
return 0
@@ -44,7 +44,7 @@ class sslUtilities:
if items.find("listener SSL") > -1:
return 1
except BaseException,msg:
except BaseException as msg:
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [IO Error with main config file [checkSSLListener]]")
return str(msg)
return 0
@@ -58,7 +58,7 @@ class sslUtilities:
return [1, withWWW, withoutWWW]
except BaseException, msg:
except BaseException as msg:
return [0, "347 " + str(msg) + " [issueSSLForDomain]"]
@staticmethod
@@ -182,7 +182,7 @@ class sslUtilities:
writeSSLConfig.close()
return 1
except BaseException, msg:
except BaseException as msg:
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [installSSLForDomain]]")
return 0
else:
@@ -203,7 +203,7 @@ class sslUtilities:
chilDomain = ChildDomains.objects.get(domain=virtualHostName)
externalApp = chilDomain.master.externalApp
DocumentRoot = ' DocumentRoot ' + chilDomain.path + '\n'
except BaseException, msg:
except BaseException as msg:
website = Websites.objects.get(domain=virtualHostName)
externalApp = website.externalApp
DocumentRoot = ' DocumentRoot /home/' + virtualHostName + '/public_html\n'
@@ -255,7 +255,7 @@ class sslUtilities:
confFile.close()
return 1
except BaseException, msg:
except BaseException as msg:
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [installSSLForDomain]")
return 0
@@ -335,7 +335,7 @@ class sslUtilities:
else:
return 0
except BaseException,msg:
except BaseException as msg:
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [Failed to obtain SSL. [obtainSSLForADomain]]")
return 0
@@ -362,6 +362,6 @@ def issueSSLForDomain(domain, adminEmail, sslpath, aliasDomain = None):
else:
return [0, "210 Failed to install SSL for domain. [issueSSLForDomain]"]
except BaseException,msg:
except BaseException as msg:
return [0, "347 "+ str(msg)+ " [issueSSLForDomain]"]