From c860dd7ea8f36288d3f05e4ac4697cbf491b8f23 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 24 Jul 2019 15:42:47 +0200 Subject: [PATCH 1/3] Update le --- CHANGELOG.md | 1 - wo/cli/plugins/site_functions.py | 14 +++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52abb6a..40796fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Arguments `--letsencrypt=clean/purge` - Incorrect directory removal during stack upgrade - ### v3.9.6.1 - 2019-07-23 #### Fixed diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index b0bf70f..573b42e 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -1298,6 +1298,7 @@ def removeNginxConf(self, domain): def removeAcmeConf(self, domain): if os.path.isdir('/etc/letsencrypt/renewal/{0}_ecc' .format(domain)): + Log.info(self, "Removing Acme configuration") Log.debug(self, "Removing Acme configuration") try: WOShellExec.cmd_exec(self, "/etc/letsencrypt/acme.sh " @@ -1308,18 +1309,21 @@ def removeAcmeConf(self, domain): .format(domain)) except CommandExecutionError as e: Log.error(self, "Cert removal failed") + WOFileUtils.rm(self, '/etc/letsencrypt/renewal/{0}_ecc' .format(domain)) WOFileUtils.rm(self, '/etc/letsencrypt/live/{0}' .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' .format(domain)) - WOFileUtils.rm( - self, '/etc/nginx/conf.d/force-ssl-{0}.conf'.format(domain)) - WOFileUtils.rm( - self, '/etc/nginx/conf.d/force-ssl-{0}.conf.disabled'.format(domain)) + WOFileUtils.rm(self, '/etc/nginx/conf.d/force-ssl-{0}.conf' + .format(domain)) + WOFileUtils.rm(self, '/etc/nginx/conf.d/force-ssl-{0}.conf.disabled' + .format(domain)) + updateSiteInfo(self, wo_domain, ssl=False) WOGit.add(self, ["/etc/letsencrypt"], msg="Deleted {0} " .format(domain)) From 85f4187334a3b161bbc760c3cdf91e4415d1b158 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 24 Jul 2019 15:45:16 +0200 Subject: [PATCH 2/3] Removing useless updateSiteinfo --- wo/cli/plugins/site_functions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index 573b42e..597c197 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -1323,7 +1323,7 @@ def removeAcmeConf(self, domain): WOFileUtils.rm(self, '/etc/nginx/conf.d/force-ssl-{0}.conf.disabled' .format(domain)) - updateSiteInfo(self, wo_domain, ssl=False) + WOGit.add(self, ["/etc/letsencrypt"], msg="Deleted {0} " .format(domain)) @@ -1439,7 +1439,7 @@ def setupLetsEncrypt(self, wo_domain_name, subdomain=False, wildcard=False, "ssl_stapling_verify on;\n" .format(WOVariables.wo_ssl_live, wo_domain_name)) sslconf.close() - updateSiteInfo(self, wo_domain_name, ssl=True) + #updateSiteInfo(self, wo_domain_name, ssl=True) WOGit.add(self, ["/etc/letsencrypt"], msg="Adding letsencrypt folder") From 8fa0d008fa0143eb4df9791bdff28febba416304 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 24 Jul 2019 15:49:18 +0200 Subject: [PATCH 3/3] [skip travis] update changelog --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40796fa..087e42c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### v3.9.x - [Unreleased] -### v3.9.6.2 - 2019-07-23 +### v3.9.6.2 - 2019-07-24 + +#### Changed + +- Improve `wo update` process duration +- Improve package install/upgrade/remove process #### Fixed