|
|
@@ -127,18 +127,18 @@ def acme_request(config, domain_name, acme_test='DNS-01', dryrun=False, domains_
|
|
|
|
|
|
args = config['certbot']['base_args']
|
|
|
if dryrun:
|
|
|
- args += "--dry-run "
|
|
|
+ args += " --dry-run "
|
|
|
args += "-m {} ".format(config['certbot']['email'])
|
|
|
args += "--server {} ".format(config['certbot']['server'])
|
|
|
|
|
|
if acme_test == 'DNS-01':
|
|
|
- args += "--manual certonly "
|
|
|
+ args += " --manual certonly "
|
|
|
args += "--preferred-challenges dns-01 "
|
|
|
args += "--manuale-auth-hook {} ".format(config['certbot']['auth_hook'])
|
|
|
args += "--manuale-cleanup-hook {} ".format(config['certbot']['cleanup_hook'])
|
|
|
args += "-d {},*.{}".format(domain_name, domain_name)
|
|
|
elif acme_test == 'HTTP-01':
|
|
|
- args += "--webroot certonly "
|
|
|
+ args += " --webroot certonly "
|
|
|
args += "--preferred-challenges http-01 "
|
|
|
args += "-w {}/{}/htdocs ".format(config['apache']['webroot'], domain_name)
|
|
|
if domains_list is None:
|
