starred/certbot-certbot-2
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-01 08:08:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/cli.py
+6 -6
View File
@@ -113,12 +113,6 @@ def usage_strings(plugins):
def _find_domains(args, installer): 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: if not args.domains:
domains = display_ops.choose_names(installer) domains = display_ops.choose_names(installer)
else: else:
@@ -835,6 +829,12 @@ class HelpfulArgumentParser(object):
# Do any post-parsing homework here # 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... # argparse seemingly isn't flexible enough to give us this behaviour easily...
if parsed_args.staging: if parsed_args.staging:
if parsed_args.server not in (flag_default("server"), constants.STAGING_URI): if parsed_args.server not in (flag_default("server"), constants.STAGING_URI):