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

move return ssl

Browse Source
This commit is contained in:
VirtuBox
2019-04-28 22:04:18 +02:00
parent 490f2c80df
commit 8a29383ea8
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1147,7 +1147,7 @@ def detSitePar(opts):
def generate_random(): def generate_random():
wo_random10 = (''.join(random.sample(string.ascii_uppercase + wo_random10 = (''.join(random.sample(string.ascii_uppercase +
string.ascii_lowercase + string.ascii_lowercase +
string.digits, 16))) string.digits, 24)))
return wo_random10 return wo_random10
@@ -1408,8 +1408,6 @@ def setupLetsEncryptSubdomain(self, wo_domain_name):
"\n to allow it to verify the site automatically.") "\n to allow it to verify the site automatically.")
# letsencrypt cert renewal # letsencrypt cert renewal
def renewLetsEncrypt(self, wo_domain_name): def renewLetsEncrypt(self, wo_domain_name):
ssl = WOShellExec.cmd_exec( ssl = WOShellExec.cmd_exec(
@@ -1642,4 +1640,4 @@ def archivedCertificateHandle(self, domain):
'/var/www/{0}/conf/nginx/ssl.conf.bak' '/var/www/{0}/conf/nginx/ssl.conf.bak'
.format(domain)) .format(domain))
return ssl return ssl