diff options
author | bmw <bmw@users.noreply.github.com> | 2015-10-21 00:20:18 +0300 |
---|---|---|
committer | bmw <bmw@users.noreply.github.com> | 2015-10-21 00:20:18 +0300 |
commit | 2cab4e577ec4a6b9b602310e74f62b1f762350a4 (patch) | |
tree | 0a29cac32cc849acea4f122c5e36a73aba85a755 | |
parent | f5a16162947540581c8bc60d9f498386175e58c1 (diff) | |
parent | e7182848a0b222f23b7c621b92830f881bcffa89 (diff) |
Merge pull request #1038 from letsencrypt/cli
Implement --standalone
-rw-r--r-- | letsencrypt/cli.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py index e10bed2e9..3af8de2a2 100644 --- a/letsencrypt/cli.py +++ b/letsencrypt/cli.py @@ -60,7 +60,7 @@ the cert. """ # altogether USAGE = SHORT_USAGE + """Major SUBCOMMANDS are: - (default) everything Obtain & install a cert in your current webserver + (default) run Obtain & install a cert in your current webserver auth Authenticate & obtain cert, but do not install it install Install a previously obtained cert in a server revoke Revoke a previously obtained certificate @@ -71,7 +71,7 @@ Choice of server for authentication/installation: --apache Use the Apache plugin for authentication & installation --nginx Use the Nginx plugin for authentication & installation - --standalone Run a standalone HTTPS server (for authentication only) + --standalone Run a standalone webserver for authentication OR: --authenticator standalone --installer nginx @@ -380,6 +380,8 @@ def choose_configurator_plugins(args, config, plugins, verb): if args.apache: req_inst = set_configurator(req_inst, "apache") req_auth = set_configurator(req_auth, "apache") + if args.standalone: + req_auth = set_configurator(req_auth, "standalone") logger.debug("Requested authenticator %s and installer %s", req_auth, req_inst) # Try to meet the user's request and/or ask them to pick plugins @@ -738,10 +740,6 @@ def create_parser(plugins, args): None, "-t", "--text", dest="text_mode", action="store_true", help="Use the text output instead of the curses UI.") helpful.add(None, "-m", "--email", help=config_help("email")) - helpful.add(None, "--apache", action="store_true", - help="Obtain and install certs using Apache") - helpful.add(None, "--nginx", action="store_true", - help="Obtain and install certs using Nginx") # positional arg shadows --domains, instead of appending, and # --domains is useful, because it can be stored in config #for subparser in parser_run, parser_auth, parser_install: @@ -854,7 +852,6 @@ def _create_subparsers(helpful): "--checkpoints", type=int, metavar="N", default=flag_default("rollback_checkpoints"), help="Revert configuration N number of checkpoints.") - helpful.add("plugins", "--init", action="store_true", help="Initialize plugins.") helpful.add("plugins", @@ -919,6 +916,12 @@ def _plugins_parsing(helpful, plugins): "plugins", "--configurator", help="Name of the plugin that is " "both an authenticator and an installer. Should not be used " "together with --authenticator or --installer.") + helpful.add("plugins", "--apache", action="store_true", + help="Obtain and install certs using Apache") + helpful.add("plugins", "--nginx", action="store_true", + help="Obtain and install certs using Nginx") + helpful.add("plugins", "--standalone", action="store_true", + help='Obtain certs using a "standalone" webserver.') # things should not be reorder past/pre this comment: # plugins_group should be displayed in --help before plugin |