From e808091a97c0b9f4ed3a2bad224434e2cf3877de Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Wed, 10 Feb 2016 10:58:07 -0800 Subject: [PATCH 1/2] Better command-line docs for renew. --- letsencrypt/cli.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py index bbfb6b88f..e91478ad4 100644 --- a/letsencrypt/cli.py +++ b/letsencrypt/cli.py @@ -1368,6 +1368,11 @@ def prepare_and_parse_args(plugins, args): help="Run without ever asking for user input. This may require " "additional command line flags; the client will try to explain " "which ones are required if it finds one missing") + helpful.add( + None, "--dry-run", action="store_true", dest="dry_run", + help="Perform a test run of the client, obtaining test (invalid) certs" + " but not saving them to disk. This can currently only be used" + " with the 'certonly' subcommand.") helpful.add( None, "--register-unsafely-without-email", action="store_true", help="Specifying this flag enables registering an account with no " @@ -1490,6 +1495,16 @@ def prepare_and_parse_args(plugins, args): help="Require that all configuration files are owned by the current " "user; only needed if your config is somewhere unsafe like /tmp/") + helpful.add_group( + "renew", description="The 'renew' subcommand will attempt to renew all " + "certificates (or more precisely, certificate lineages) you have previously " + "obtained, and print a summary of the results. " + "By default, 'renew' will reuse the options " + "used to create obtain or most recently successfully renew each certificate lineage. " + "You can try it with `--dry-run` first. " + "For more fine-grained control, you can renew individual lineages with" + "the `certonly` subcommand.") + helpful.add_deprecated_argument("--agree-dev-preview", 0) _create_subparsers(helpful) @@ -1586,10 +1601,6 @@ def _paths_parser(helpful): add("testing", "--test-cert", "--staging", action='store_true', dest='staging', help='Use the staging server to obtain test (invalid) certs; equivalent' ' to --server ' + constants.STAGING_URI) - add("testing", "--dry-run", action="store_true", dest="dry_run", - help="Perform a test run of the client, obtaining test (invalid) certs" - " but not saving them to disk. This can currently only be used" - " with the 'certonly' subcommand.") def _plugins_parsing(helpful, plugins): From 78cde8b7d9a3c04967413eb9ad7743bc4996cca5 Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Wed, 10 Feb 2016 11:39:03 -0800 Subject: [PATCH 2/2] Update language to clarify that only expiring certs are renewed --- letsencrypt/cli.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py index e91478ad4..cdd6e5c45 100644 --- a/letsencrypt/cli.py +++ b/letsencrypt/cli.py @@ -1496,14 +1496,14 @@ def prepare_and_parse_args(plugins, args): "user; only needed if your config is somewhere unsafe like /tmp/") helpful.add_group( - "renew", description="The 'renew' subcommand will attempt to renew all " - "certificates (or more precisely, certificate lineages) you have previously " - "obtained, and print a summary of the results. " - "By default, 'renew' will reuse the options " - "used to create obtain or most recently successfully renew each certificate lineage. " - "You can try it with `--dry-run` first. " - "For more fine-grained control, you can renew individual lineages with" - "the `certonly` subcommand.") + "renew", description="The 'renew' subcommand will attempt to renew all" + " certificates (or more precisely, certificate lineages) you have" + " previously obtained if they are close to expiry, and print a" + " summary of the results. By default, 'renew' will reuse the options" + " used to create obtain or most recently successfully renew each" + " certificate lineage. You can try it with `--dry-run` first. For" + " more fine-grained control, you can renew individual lineages with" + " the `certonly` subcommand.") helpful.add_deprecated_argument("--agree-dev-preview", 0)