From 137318d562765b26e90dee1656c59a15b29f17d5 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Fri, 30 Aug 2019 08:55:23 +0200 Subject: [PATCH] Reduce Log.info amount for SSL --- wo/cli/plugins/site.py | 9 +++++---- wo/cli/plugins/site_functions.py | 7 ------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/wo/cli/plugins/site.py b/wo/cli/plugins/site.py index 129f6e4..f3e2dd6 100644 --- a/wo/cli/plugins/site.py +++ b/wo/cli/plugins/site.py @@ -773,6 +773,9 @@ class WOSiteCreateController(CementBaseController): isWildcard = checkWildcardExist(self, wo_root_domain) Log.debug(self, "isWildcard = {0}".format(isWildcard)) if isWildcard: + Log.info(self, "Using existing Wildcard SSL " + "certificate from {0} to secure {1}" + .format(wo_root_domain, wo_domain)) Log.debug(self, "symlink wildcard " "cert between {0} & {1}" .format(wo_domain, wo_root_domain)) @@ -1382,12 +1385,10 @@ class WOSiteUpdateController(CementBaseController): # check if a wildcard cert for the root domain exist Log.debug(self, "checkWildcardExist on *.{0}" .format(wo_root_domain)) - Log.info(self, "Checking if there is a wildcard " - "certificate available from the root domain") isWildcard = checkWildcardExist(self, wo_root_domain) Log.debug(self, "isWildcard = {0}".format(isWildcard)) if isWildcard: - Log.info(self, "Using existing Wildcard SSL" + Log.info(self, "Using existing Wildcard SSL " "certificate from {0} to secure {1}" .format(wo_root_domain, wo_domain)) Log.debug(self, "symlink wildcard " @@ -1424,7 +1425,7 @@ class WOSiteUpdateController(CementBaseController): Log.error(self, "service nginx reload failed. " "check issues with `nginx -t` command") Log.info(self, "Congratulations! Successfully " - "Configured SSl for Site " + "Configured SSL for Site " " https://{0}".format(wo_domain)) if wo_subdomain: if (SSL.getExpirationDays(self, wo_root_domain) > 0): diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index ca8269e..1f70093 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -1595,9 +1595,6 @@ def httpsRedirect(self, wo_domain_name, redirect=True, wildcard=False): else: if wildcard: try: - Log.info( - self, "Adding /etc/nginx/conf.d/force-ssl-{0}.conf" - .format(wo_domain_name)) sslconf = open("/etc/nginx/conf.d/force-ssl-{0}.conf" .format(wo_domain_name), encoding='utf-8', mode='w') @@ -1617,10 +1614,6 @@ def httpsRedirect(self, wo_domain_name, redirect=True, wildcard=False): else: try: - Log.info( - self, "Adding /etc/nginx/conf.d/force-ssl-{0}.conf" - .format(wo_domain_name)) - sslconf = open("/etc/nginx/conf.d/force-ssl-{0}.conf" .format(wo_domain_name), encoding='utf-8', mode='w')