Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify acme

Browse Source
This commit is contained in:
VirtuBox
2019-10-28 11:15:53 +01:00
parent 72d6f33b7b
commit 1e5e07e277
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wo/core/acme.py
View File

@@ -173,6 +173,13 @@ class WOAcme:
.format(domain)) .format(domain))
sslforce = ("/etc/nginx/conf.d/force-ssl-{0}.conf" sslforce = ("/etc/nginx/conf.d/force-ssl-{0}.conf"
.format(domain)) .format(domain))
acmedir = [
'{0}'.format(sslforce), '{0}'.format(sslconf),
'{0}/{1}_ecc'.format(WOVar.wo_ssl_archive, domain),
'{0}.disabled'.format(sslconf), '{0}.disabled'
.format(sslforce), '{0}/{1}'
.format(WOVar.wo_ssl_live, domain),
'/etc/letsencrypt/shared/{0}.conf'.format(domain)]
wo_domain = domain wo_domain = domain
if WOAcme.cert_check(self, wo_domain): if WOAcme.cert_check(self, wo_domain):
Log.info(self, "Removing Acme configuration") Log.info(self, "Removing Acme configuration")
@@ -184,17 +191,10 @@ class WOAcme:
except CommandExecutionError as e: except CommandExecutionError as e:
Log.debug(self, "{0}".format(e)) Log.debug(self, "{0}".format(e))
Log.error(self, "Cert removal failed") Log.error(self, "Cert removal failed")
WOFileUtils.rm(self, '{0}/{1}_ecc' # remove all files and directories
.format(WOVar.wo_ssl_archive, domain)) for dir in acmedir:
WOFileUtils.rm(self, '{0}/{1}' if os.path.exists('{0}'.format(dir)):
.format(WOVar.wo_ssl_live, domain)) WOFileUtils.rm(self, '{0}'.format(dir))
WOFileUtils.rm(self, '{0}'.format(sslconf))
WOFileUtils.rm(self, '{0}.disabled'.format(sslconf))
WOFileUtils.rm(self, '{0}'.format(sslforce))
WOFileUtils.rm(self, '{0}.disabled'
.format(sslforce))
WOFileUtils.rm(self, '/etc/letsencrypt/shared/{0}.conf'
.format(domain))
# find all broken symlinks # find all broken symlinks
WOFileUtils.findBrokenSymlink(self, "/var/www") WOFileUtils.findBrokenSymlink(self, "/var/www")
else: else: