From c82ae7e755aee9eb11e5f17623b7002c77c11d9d Mon Sep 17 00:00:00 2001 From: Seth Schoen Date: Mon, 25 Jan 2016 17:17:24 -0800 Subject: [PATCH 1/2] Rename --renew-by-default to --force-renewal --- letsencrypt/cli.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py index 9fe821dd3..d2acb03bc 100644 --- a/letsencrypt/cli.py +++ b/letsencrypt/cli.py @@ -257,7 +257,7 @@ def _handle_identical_cert_request(config, cert): """ if config.renew_by_default: - logger.info("Auto-renewal forced with --renew-by-default...") + logger.info("Auto-renewal forced with --force-renewal or --renew-by-default...") return "renew", cert if cert.should_autorenew(interactive=True): logger.info("Cert is due for renewal, auto-renewing...") @@ -986,10 +986,12 @@ def prepare_and_parse_args(plugins, args): version="%(prog)s {0}".format(letsencrypt.__version__), help="show program's version number and exit") helpful.add( - "automation", "--renew-by-default", action="store_true", - help="Select renewal by default when domains are a superset of a " - "previously attained cert (often --keep-until-expiring is " - "more appropriate). Implies --expand.") + "automation", "--force-renewal", "--renew-by-default", + action="store_true", dest="renew_by_default", help="If a certificate " + "already exists for the requested domains, renew it now, " + "regardless of whether it is near expiry. (Often " + "--keep-until-expiring is more appropriate). Also implies " + "--expand.") helpful.add( "automation", "--agree-tos", dest="tos", action="store_true", help="Agree to the Let's Encrypt Subscriber Agreement") From 3ca769e634d8f45b5c8c45baee34e5640ef31674 Mon Sep 17 00:00:00 2001 From: Seth Schoen Date: Tue, 9 Feb 2016 16:09:30 -0800 Subject: [PATCH 2/2] Update logging to mention --force-renew --- letsencrypt/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py index c98b3f0d7..e0a07a94b 100644 --- a/letsencrypt/cli.py +++ b/letsencrypt/cli.py @@ -282,7 +282,7 @@ def _treat_as_renewal(config, domains): def _should_renew(config, lineage): "Return true if any of the circumstances for automatic renewal apply." if config.renew_by_default: - logger.info("Auto-renewal forced with --renew-by-default...") + logger.info("Auto-renewal forced with --force-renewal...") return True if lineage.should_autorenew(interactive=True): logger.info("Cert is due for renewal, auto-renewing...")