mirror
/
cyberpanel
mirror of https://github.com/usmannasir/cyberpanel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change: reissue ssl if requested

This commit is contained in:
Usman Nasir 2020-11-12 15:23:01 +05:00
parent 48895c8ba5
commit df58c27f17
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dns/dnsManager.py
View File

@ -1160,14 +1160,6 @@ class DNSManager:
command = 'systemctl disable systemd-resolved.service'
ProcessUtilities.executioner(command)
try:
os.rename('/etc/resolv.conf', 'etc/resolved.conf')
except OSError as e:
try:
os.remove('/etc/resolv.conf')
except OSError as e1:
pass
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:

21
plogical/virtualHostUtilities.py
View File

@ -600,12 +600,12 @@ class virtualHostUtilities:
adminEmail = "email@" + virtualHost
if not os.path.exists(pathToStoreSSLFullChain):
retValues = sslUtilities.issueSSLForDomain(virtualHost, adminEmail, path)
retValues = sslUtilities.issueSSLForDomain(virtualHost, adminEmail, path)
if retValues[0] == 0:
print("0," + str(retValues[1]))
return 0, retValues[1]
if retValues[0] == 0:
print("0," + str(retValues[1]))
return 0, retValues[1]
## removing old certs for lscpd
if os.path.exists(destPrivKey):
@ -665,13 +665,12 @@ class virtualHostUtilities:
srcFullChain = '/etc/letsencrypt/live/' + virtualHost + '/fullchain.pem'
srcPrivKey = '/etc/letsencrypt/live/' + virtualHost + '/privkey.pem'
if not os.path.exists(srcFullChain):
adminEmail = "email@" + virtualHost
retValues = sslUtilities.issueSSLForDomain(virtualHost, adminEmail, path)
adminEmail = "email@" + virtualHost
retValues = sslUtilities.issueSSLForDomain(virtualHost, adminEmail, path)
if retValues[0] == 0:
print("0," + str(retValues[1]))
return 0, retValues[1]
if retValues[0] == 0:
print("0," + str(retValues[1]))
return 0, retValues[1]
## MailServer specific functions