upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-05-28 04:34:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Treat webroot_map -> domain importation as a general property of configs

Browse source
This commit is contained in:
Peter Eckersley 2016-01-28 14:54:11 -08:00
parent 002845c484
commit 63851bfa52
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
letsencrypt/cli.py
View file

@ -113,12 +113,6 @@ def usage_strings(plugins):
def _find_domains(args, installer):
# we get domains from -d, but also from the webroot map...
if args.webroot_map:
for domain in args.webroot_map.keys():
if domain not in args.domains:
args.domains.append(domain)
if not args.domains:
domains = display_ops.choose_names(installer)
else:
@ -835,6 +829,12 @@ class HelpfulArgumentParser(object):
# Do any post-parsing homework here
# we get domains from -d, but also from the webroot map...
if parsed_args.webroot_map:
for domain in parsed_args.webroot_map.keys():
if domain not in parsed_args.domains:
parsed_args.domains.append(domain)
# argparse seemingly isn't flexible enough to give us this behaviour easily...
if parsed_args.staging:
if parsed_args.server not in (flag_default("server"), constants.STAGING_URI):