From 335ceec966b8acd0ae1221374bf6577784a95537 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 5 Sep 2019 12:41:02 +0200 Subject: [PATCH] Few fixes in logging --- wo/cli/plugins/site_functions.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index 3d58a94..1b1b755 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -1394,7 +1394,7 @@ def setupLetsEncrypt(self, wo_domain_name, subdomain=False, wildcard=False, acme_mode, keylenght)) if ssl: Log.valide(self, "Issuing SSL cert with acme.sh") - Log.wait(self, "Deploying SSL cert with acme.sh") + Log.wait(self, "Deploying SSL cert") Log.debug(self, "Cert deployment for domain: {0}" .format(wo_domain_name)) try: @@ -1414,7 +1414,7 @@ def setupLetsEncrypt(self, wo_domain_name, subdomain=False, wildcard=False, "service nginx restart\" " .format(WOVariables.wo_ssl_live, wo_domain_name)) - Log.valide(self, "Deploying SSL cert with acme.sh") + Log.valide(self, "Deploying SSL cert") if os.path.isdir('/var/www/{0}/conf/nginx' .format(wo_domain_name)): @@ -1562,8 +1562,7 @@ def httpsRedirect(self, wo_domain_name, redirect=True, wildcard=False): "/etc/nginx/conf.d/force-ssl-{0}.conf" .format(wo_domain_name)) else: - Log.wait(self, "Adding HTTPS redirection" - " http://{0}".format(wo_domain_name)) + Log.wait(self, "Adding HTTPS redirection") if wildcard: try: sslconf = open("/etc/nginx/conf.d/force-ssl-{0}.conf" @@ -1602,11 +1601,9 @@ def httpsRedirect(self, wo_domain_name, redirect=True, wildcard=False): Log.debug(self, "Error occured while generating " "/etc/nginx/conf.d/force-ssl-{0}.conf" .format(wo_domain_name)) - Log.failed(self, "Adding HTTPS redirection" - " http://{0}".format(wo_domain_name)) + Log.failed(self, "Adding HTTPS redirection") else: - Log.valide(self, "Adding HTTPS redirection" - " http://{0}".format(wo_domain_name)) + Log.valide(self, "Adding HTTPS redirection") # Nginx Configation into GIT WOGit.add(self, ["/etc/nginx"], msg="Adding /etc/nginx/conf.d/"