From df58c27f1744b22566978bc133378bdc4d9b11ad Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Thu, 12 Nov 2020 15:23:01 +0500 Subject: [PATCH] change: reissue ssl if requested --- dns/dnsManager.py | 8 -------- plogical/virtualHostUtilities.py | 21 ++++++++++----------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dns/dnsManager.py b/dns/dnsManager.py index fbbcdf73b..acdca57a9 100755 --- a/dns/dnsManager.py +++ b/dns/dnsManager.py @@ -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: diff --git a/plogical/virtualHostUtilities.py b/plogical/virtualHostUtilities.py index 869897ca3..899814849 100755 --- a/plogical/virtualHostUtilities.py +++ b/plogical/virtualHostUtilities.py @@ -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