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

Initial ModSec integration and bug fix to UI.

Browse Source
This commit is contained in:
usmannasir
2018-03-19 22:15:02 +05:00
parent bf496020b2
commit af07a0fec5
18 changed files with 1037 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plogical/sslUtilities.py
View File

@@ -33,7 +33,7 @@ class sslUtilities:
keyFile = " keyFile " + pathToStoreSSL + "/privkey.pem" + "\n"
certFile = " certFile " + pathToStoreSSL + "/fullchain.pem" + "\n"
certChain = " certChain 1" + "\n"
sslProtocol = " sslProtocol 31" + "\n"
sslProtocol = " sslProtocol 30" + "\n"
map = " map " + virtualHostName + " " + virtualHostName + "\n"
final = "}" + "\n" + "\n"
@@ -87,7 +87,7 @@ class sslUtilities:
keyFile = " keyFile " + pathToStoreSSL + "/privkey.pem" + "\n"
certFile = " certFile " + pathToStoreSSL + "/fullchain.pem" + "\n"
certChain = " certChain 1" + "\n"
sslProtocol = " sslProtocol 31" + "\n"
sslProtocol = " sslProtocol 30" + "\n"
final = "}"
writeSSLConfig.writelines("\n")
@@ -146,7 +146,7 @@ class sslUtilities:
else:
command = "certbot certonly -n --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName
logging.CyberCPLogFileWriter.writeToFile(
"SSL is issued without 'www' due to DNS error! for domain :" + virtualHostName)
"SSL is issued without 'www' due to DNS error! for domain : " + virtualHostName)
except:
command = "certbot certonly -n --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName
@@ -349,7 +349,7 @@ def issueSSLForDomain(domain,adminEmail,sslpath):
if sslUtilities.installSSLForDomain(domain) == 1:
return [1, "None"]
else:
[0, "327 Failed to install SSL for domain. [issueSSLForDomain]"]
return [0, "352 Failed to install SSL for domain. [issueSSLForDomain]"]
else:
return [0,"347 Failed to obtain SSL [issueSSLForDomain]"]
except BaseException,msg: