From eabfa5a7ff68f28d186abc0ead5bf3f89b4ce1b0 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Fri, 30 Aug 2019 08:40:35 +0200 Subject: [PATCH] Add config removal --- wo/cli/plugins/site.py | 7 ++++++- wo/cli/plugins/site_functions.py | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/wo/cli/plugins/site.py b/wo/cli/plugins/site.py index 3226d56..112a009 100644 --- a/wo/cli/plugins/site.py +++ b/wo/cli/plugins/site.py @@ -1441,8 +1441,13 @@ class WOSiteUpdateController(CementBaseController): elif data['letsencrypt'] is False: if pargs.letsencrypt == "off": - if os.path.isfile("{0}/conf/nginx/ssl.conf" + if os.path.islink("{0}/conf/nginx/ssl.conf" .format(wo_site_webroot)): + WOFileUtils.remove_symlink(self, + "{0}/conf/nginx/ssl.conf" + .format(wo_site_webroot)) + elif os.path.isfile("{0}/conf/nginx/ssl.conf" + .format(wo_site_webroot)): Log.info(self, 'Setting Nginx configuration') WOFileUtils.mvfile(self, "{0}/conf/nginx/ssl.conf" .format(wo_site_webroot), diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index 948a6e1..ca8269e 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -1270,6 +1270,10 @@ def removeAcmeConf(self, domain): if os.path.islink('{0}'.format(sslconf)): # remove broken symlinks WOFileUtils.remove_symlink(self, symlink) + else: + if os.path.islink("{0}".format(sslconf)): + WOFileUtils.remove_symlink(self, "{0}".format(sslconf)) + WOFileUtils.rm(self, '{0}'.format(sslforce)) if WOFileUtils.grepcheck(self, '/var/www/22222/conf/nginx/ssl.conf', '{0}'.format(domain)):