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

Fix keylength

Browse Source
This commit is contained in:
VirtuBox
2019-09-30 15:05:07 +02:00
parent 122428bab7
commit 555760164b
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -738,7 +738,9 @@ class WOSiteCreateController(CementBaseController):
if data['letsencrypt'] is True: if data['letsencrypt'] is True:
Log.debug(self, "Going to issue Let's Encrypt certificate") Log.debug(self, "Going to issue Let's Encrypt certificate")
acmedata = dict(acme_domains, dns=False, acme_dns='dns_cf', acmedata = dict(acme_domains, dns=False, acme_dns='dns_cf',
dnsalias=False, acme_alias='') dnsalias=False, acme_alias='', keylength='')
acmedata['keylength'] = self.app.config.get('letsencrypt',
'keylength')
if pargs.dns: if pargs.dns:
Log.debug(self, "DNS validation enabled") Log.debug(self, "DNS validation enabled")
acmedata['dns'] = True acmedata['dns'] = True
@@ -1240,10 +1242,11 @@ class WOSiteUpdateController(CementBaseController):
if pargs.letsencrypt: if pargs.letsencrypt:
acme_domains = [] acme_domains = []
acmedata = dict(acme_domains, dns=False, acme_dns='dns_cf', acmedata = dict(acme_domains, dns=False, acme_dns='dns_cf',
dnsalias=False, acme_alias='') dnsalias=False, acme_alias='', keylength='')
(wo_domain_type, wo_root_domain) = WODomain.getdomainlevel( (wo_domain_type, wo_root_domain) = WODomain.getdomainlevel(
self, wo_domain) self, wo_domain)
acmedata['keylength'] = self.app.config.get('letsencrypt',
'keylength')
if pargs.letsencrypt == 'on': if pargs.letsencrypt == 'on':
data['letsencrypt'] = True data['letsencrypt'] = True
letsencrypt = True letsencrypt = True

2
wo/core/acme.py
View File

@@ -16,7 +16,7 @@ class WOAcme:
"""Issue SSL certificates with acme.sh""" """Issue SSL certificates with acme.sh"""
all_domains = '\' -d \''.join(acme_domains) all_domains = '\' -d \''.join(acme_domains)
wo_acme_dns = acmedata['acme_dns'] wo_acme_dns = acmedata['acme_dns']
keylenght = "{0}".format(WOVariables.wo_keylength) keylenght = acmedata['keylength']
wo_acme_exec = ("/etc/letsencrypt/acme.sh --config-home " wo_acme_exec = ("/etc/letsencrypt/acme.sh --config-home "
"'/etc/letsencrypt/config'") "'/etc/letsencrypt/config'")
if acmedata['dns'] is True: if acmedata['dns'] is True:

2
wo/core/variables.py
View File

@@ -111,8 +111,6 @@ class WOVariables():
wo_nginx = ["nginx-custom", "nginx-wo"] wo_nginx = ["nginx-custom", "nginx-wo"]
wo_nginx_key = '188C9FB063F0247A' wo_nginx_key = '188C9FB063F0247A'
wo_keylength = self.app.config.get('letsencrypt', 'keylength')
wo_php = ["php7.2-fpm", "php7.2-curl", "php7.2-gd", "php7.2-imap", wo_php = ["php7.2-fpm", "php7.2-curl", "php7.2-gd", "php7.2-imap",
"php7.2-readline", "php7.2-common", "php7.2-recode", "php7.2-readline", "php7.2-common", "php7.2-recode",
"php7.2-cli", "php7.2-mbstring", "php7.2-intl", "php7.2-cli", "php7.2-mbstring", "php7.2-intl",