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

Reduce Log.info amount for SSL

Browse Source
This commit is contained in:
VirtuBox
2019-08-30 08:55:23 +02:00
parent 7f0463602d
commit 137318d562
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wo/cli/plugins/site.py
View File

@@ -773,6 +773,9 @@ class WOSiteCreateController(CementBaseController):
isWildcard = checkWildcardExist(self, wo_root_domain) isWildcard = checkWildcardExist(self, wo_root_domain)
Log.debug(self, "isWildcard = {0}".format(isWildcard)) Log.debug(self, "isWildcard = {0}".format(isWildcard))
if 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 " Log.debug(self, "symlink wildcard "
"cert between {0} & {1}" "cert between {0} & {1}"
.format(wo_domain, wo_root_domain)) .format(wo_domain, wo_root_domain))
@@ -1382,12 +1385,10 @@ class WOSiteUpdateController(CementBaseController):
# check if a wildcard cert for the root domain exist # check if a wildcard cert for the root domain exist
Log.debug(self, "checkWildcardExist on *.{0}" Log.debug(self, "checkWildcardExist on *.{0}"
.format(wo_root_domain)) .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) isWildcard = checkWildcardExist(self, wo_root_domain)
Log.debug(self, "isWildcard = {0}".format(isWildcard)) Log.debug(self, "isWildcard = {0}".format(isWildcard))
if isWildcard: if isWildcard:
Log.info(self, "Using existing Wildcard SSL" Log.info(self, "Using existing Wildcard SSL "
"certificate from {0} to secure {1}" "certificate from {0} to secure {1}"
.format(wo_root_domain, wo_domain)) .format(wo_root_domain, wo_domain))
Log.debug(self, "symlink wildcard " Log.debug(self, "symlink wildcard "
@@ -1424,7 +1425,7 @@ class WOSiteUpdateController(CementBaseController):
Log.error(self, "service nginx reload failed. " Log.error(self, "service nginx reload failed. "
"check issues with `nginx -t` command") "check issues with `nginx -t` command")
Log.info(self, "Congratulations! Successfully " Log.info(self, "Congratulations! Successfully "
"Configured SSl for Site " "Configured SSL for Site "
" https://{0}".format(wo_domain)) " https://{0}".format(wo_domain))
if wo_subdomain: if wo_subdomain:
if (SSL.getExpirationDays(self, wo_root_domain) > 0): if (SSL.getExpirationDays(self, wo_root_domain) > 0):

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

@@ -1595,9 +1595,6 @@ def httpsRedirect(self, wo_domain_name, redirect=True, wildcard=False):
else: else:
if wildcard: if wildcard:
try: 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" sslconf = open("/etc/nginx/conf.d/force-ssl-{0}.conf"
.format(wo_domain_name), .format(wo_domain_name),
encoding='utf-8', mode='w') encoding='utf-8', mode='w')
@@ -1617,10 +1614,6 @@ def httpsRedirect(self, wo_domain_name, redirect=True, wildcard=False):
else: else:
try: 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" sslconf = open("/etc/nginx/conf.d/force-ssl-{0}.conf"
.format(wo_domain_name), .format(wo_domain_name),
encoding='utf-8', mode='w') encoding='utf-8', mode='w')