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

Installers are actually useful in auth mode

Browse Source
This commit is contained in:
Peter Eckersley
2015-10-17 14:28:38 -07:00
parent c89e192ee7
commit 4996e9b678
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/cli.py
+3 -6
View File
@@ -348,8 +348,6 @@ def choose_configurator_plugins(args, config, plugins, verb):
need_inst = need_auth = (verb == "run") need_inst = need_auth = (verb == "run")
if verb == "auth": if verb == "auth":
need_auth = True need_auth = True
if args.installer:
raise ConfiguratorError, "Specifying an installer doesn't make sense in auth mode"
if verb == "install": if verb == "install":
need_inst = True need_inst = True
if args.authenticator: if args.authenticator:
@@ -424,8 +422,8 @@ def auth(args, config, plugins):
return "--domains and --csr are mutually exclusive" return "--domains and --csr are mutually exclusive"
try: try:
# installers are used in auth mode to determine domain names
installer, authenticator = choose_configurator_plugins(args, config, plugins, "auth") installer, authenticator = choose_configurator_plugins(args, config, plugins, "auth")
installer = None # we're doing auth!
except ConfiguratorError, e: except ConfiguratorError, e:
return e.message return e.message
@@ -449,8 +447,7 @@ def install(args, config, plugins):
# XXX: Update for renewer/RenewableCert # XXX: Update for renewer/RenewableCert
try: try:
installer, authenticator = choose_configurator_plugins(args, config, plugins, "auth") installer, _ = choose_configurator_plugins(args, config, plugins, "auth")
authenticator = None # we're doing install!
except ConfiguratorError, e: except ConfiguratorError, e:
return e.message return e.message
@@ -903,7 +900,7 @@ def _plugins_parsing(helpful, plugins):
helpful.add( helpful.add(
"plugins", "-a", "--authenticator", help="Authenticator plugin name.") "plugins", "-a", "--authenticator", help="Authenticator plugin name.")
helpful.add( helpful.add(
"plugins", "-i", "--installer", help="Installer plugin name.") "plugins", "-i", "--installer", help="Installer plugin name (also used to find domains).")
helpful.add( helpful.add(
"plugins", "--configurator", help="Name of the plugin that is " "plugins", "--configurator", help="Name of the plugin that is "
"both an authenticator and an installer. Should not be used " "both an authenticator and an installer. Should not be used "