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

Further flag tweaking

Browse Source
This commit is contained in:
Peter Eckersley
2015-12-12 17:01:43 -08:00
parent b348874372
commit 173ea94e17
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/cli.py
+3 -3
View File
@@ -306,14 +306,14 @@ def _handle_subset_cert_request(config, domains, cert):
"You have an existing certificate that contains a portion of " "You have an existing certificate that contains a portion of "
"the domains you requested (ref: {0}){br}{br}It contains these " "the domains you requested (ref: {0}){br}{br}It contains these "
"names: {1}{br}{br}You requested these names for the new " "names: {1}{br}{br}You requested these names for the new "
"certificate: {2}.{br}{br}Do you want to replace this existing " "certificate: {2}.{br}{br}Do you want to expand and replace this existing "
"certificate with the new certificate?" "certificate with the new certificate?"
).format(cert.configfile.filename, ).format(cert.configfile.filename,
existing, existing,
", ".join(domains), ", ".join(domains),
br=os.linesep) br=os.linesep)
if config.expand or config.renew_by_default or zope.component.getUtility( if config.expand or config.renew_by_default or zope.component.getUtility(
interfaces.IDisplay).yesno(question, "Replace", "Cancel"): interfaces.IDisplay).yesno(question, "Expand", "Cancel"):
return "renew", cert return "renew", cert
else: else:
reporter_util = zope.component.getUtility(interfaces.IReporter) reporter_util = zope.component.getUtility(interfaces.IReporter)
@@ -968,7 +968,7 @@ def prepare_and_parse_args(plugins, args):
"automation", "automation",
description="Arguments for automating execution & other tweaks") description="Arguments for automating execution & other tweaks")
helpful.add( helpful.add(
"automation", "--keep-until-expiring", "-k", "--reinstall", "automation", "--keep-until-expiring", "--keep", "--reinstall",
dest="reinstall", action="store_true", dest="reinstall", action="store_true",
help="If the requested cert matches an existing cert, always keep the " help="If the requested cert matches an existing cert, always keep the "
"existing one until it is due for renewal (for the " "existing one until it is due for renewal (for the "