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

Update le

Browse Source
This commit is contained in:
VirtuBox
2019-07-24 15:42:47 +02:00
parent a97bc9a4b8
commit c860dd7ea8
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -16,7 +16,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Arguments `--letsencrypt=clean/purge` - Arguments `--letsencrypt=clean/purge`
- Incorrect directory removal during stack upgrade - Incorrect directory removal during stack upgrade
### v3.9.6.1 - 2019-07-23 ### v3.9.6.1 - 2019-07-23
#### Fixed #### Fixed

14
wo/cli/plugins/site_functions.py
View File

@@ -1298,6 +1298,7 @@ def removeNginxConf(self, domain):
def removeAcmeConf(self, domain): def removeAcmeConf(self, domain):
if os.path.isdir('/etc/letsencrypt/renewal/{0}_ecc' if os.path.isdir('/etc/letsencrypt/renewal/{0}_ecc'
.format(domain)): .format(domain)):
Log.info(self, "Removing Acme configuration")
Log.debug(self, "Removing Acme configuration") Log.debug(self, "Removing Acme configuration")
try: try:
WOShellExec.cmd_exec(self, "/etc/letsencrypt/acme.sh " WOShellExec.cmd_exec(self, "/etc/letsencrypt/acme.sh "
@@ -1308,18 +1309,21 @@ def removeAcmeConf(self, domain):
.format(domain)) .format(domain))
except CommandExecutionError as e: except CommandExecutionError as e:
Log.error(self, "Cert removal failed") Log.error(self, "Cert removal failed")
WOFileUtils.rm(self, '/etc/letsencrypt/renewal/{0}_ecc' WOFileUtils.rm(self, '/etc/letsencrypt/renewal/{0}_ecc'
.format(domain)) .format(domain))
WOFileUtils.rm(self, '/etc/letsencrypt/live/{0}' WOFileUtils.rm(self, '/etc/letsencrypt/live/{0}'
.format(domain)) .format(domain))
WOFileUtils.rm(self, '/var/www/{0}/conf/nginx/ssl.conf'.format(domain)) WOFileUtils.rm(self, '/var/www/{0}/conf/nginx/ssl.conf'
.format(domain))
WOFileUtils.rm(self, '/var/www/{0}/conf/nginx/ssl.conf.disabled' WOFileUtils.rm(self, '/var/www/{0}/conf/nginx/ssl.conf.disabled'
.format(domain)) .format(domain))
WOFileUtils.rm( WOFileUtils.rm(self, '/etc/nginx/conf.d/force-ssl-{0}.conf'
self, '/etc/nginx/conf.d/force-ssl-{0}.conf'.format(domain)) .format(domain))
WOFileUtils.rm( WOFileUtils.rm(self, '/etc/nginx/conf.d/force-ssl-{0}.conf.disabled'
self, '/etc/nginx/conf.d/force-ssl-{0}.conf.disabled'.format(domain)) .format(domain))
updateSiteInfo(self, wo_domain, ssl=False)
WOGit.add(self, ["/etc/letsencrypt"], WOGit.add(self, ["/etc/letsencrypt"],
msg="Deleted {0} " msg="Deleted {0} "
.format(domain)) .format(domain))