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

Few fixes in logging

Browse Source
This commit is contained in:
VirtuBox
2019-09-05 12:41:02 +02:00
parent 5565938819
commit 335ceec966
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1394,7 +1394,7 @@ def setupLetsEncrypt(self, wo_domain_name, subdomain=False, wildcard=False,
acme_mode, keylenght)) acme_mode, keylenght))
if ssl: if ssl:
Log.valide(self, "Issuing SSL cert with acme.sh") 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}" Log.debug(self, "Cert deployment for domain: {0}"
.format(wo_domain_name)) .format(wo_domain_name))
try: try:
@@ -1414,7 +1414,7 @@ def setupLetsEncrypt(self, wo_domain_name, subdomain=False, wildcard=False,
"service nginx restart\" " "service nginx restart\" "
.format(WOVariables.wo_ssl_live, .format(WOVariables.wo_ssl_live,
wo_domain_name)) 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' if os.path.isdir('/var/www/{0}/conf/nginx'
.format(wo_domain_name)): .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" "/etc/nginx/conf.d/force-ssl-{0}.conf"
.format(wo_domain_name)) .format(wo_domain_name))
else: else:
Log.wait(self, "Adding HTTPS redirection" Log.wait(self, "Adding HTTPS redirection")
" http://{0}".format(wo_domain_name))
if wildcard: if wildcard:
try: try:
sslconf = open("/etc/nginx/conf.d/force-ssl-{0}.conf" 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 " Log.debug(self, "Error occured while generating "
"/etc/nginx/conf.d/force-ssl-{0}.conf" "/etc/nginx/conf.d/force-ssl-{0}.conf"
.format(wo_domain_name)) .format(wo_domain_name))
Log.failed(self, "Adding HTTPS redirection" Log.failed(self, "Adding HTTPS redirection")
" http://{0}".format(wo_domain_name))
else: else:
Log.valide(self, "Adding HTTPS redirection" Log.valide(self, "Adding HTTPS redirection")
" http://{0}".format(wo_domain_name))
# Nginx Configation into GIT # Nginx Configation into GIT
WOGit.add(self, WOGit.add(self,
["/etc/nginx"], msg="Adding /etc/nginx/conf.d/" ["/etc/nginx"], msg="Adding /etc/nginx/conf.d/"