fix letsencrypt

This commit is contained in:
VirtuBox
2019-03-22 06:11:26 +01:00
parent b740e31415
commit a675a50aef

View File

@@ -1266,7 +1266,6 @@ def setupLetsEncrypt(self, wo_domain_name):
def setupLetsEncryptSubdomain(self, wo_domain_name):
wo_wp_email = WOVariables.wo_email
if os.path.isfile("{0}/{1}_ecc/{1}.conf"
.format(WOVariables.wo_ssl_archive, wo_domain_name)):
@@ -1274,7 +1273,7 @@ def setupLetsEncryptSubdomain(self, wo_domain_name):
.format(wo_domain_name))
ssl = archivedCertificateHandle(self, wo_domain_name)
else:
Log.warn(self, "Please wait while we fetch the new HTTPS certificate"
Log.info(self, "Please wait while we fetch the new HTTPS certificate"
" for your site.\nIt may take a few minutes"
" depending on the network.")
sslissue = WOShellExec.cmd_exec(self, "/etc/letsencrypt/acme.sh "
@@ -1301,6 +1300,7 @@ def setupLetsEncryptSubdomain(self, wo_domain_name):
"\"service nginx restart\" "
.format(WOVariables.wo_ssl_live,
wo_domain_name))
if ssl:
try:
@@ -1328,7 +1328,7 @@ def setupLetsEncryptSubdomain(self, wo_domain_name):
Log.debug(self, "Error occured while generating "
"ssl.conf")
else:
Log.error(self, "Unable to install certificate", False)
Log.error(self, "Unable to create ssl.conf", False)
Log.error(self, "Please make sure that your site is pointed to \n"
"same server on which "
"you are running Let\'s Encrypt Client "