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

Responding to comments (logger.debug, reject --csr in renew)

Browse Source
This commit is contained in:
Seth Schoen
2016-02-04 16:04:53 -08:00
parent 375543eb32
commit e2e0dddaa4
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/cli.py
+9 -3
View File
@@ -229,7 +229,7 @@ def _find_duplicative_certs(config, domains):
candidate_lineage = storage.RenewableCert(renewal_file, cli_config) candidate_lineage = storage.RenewableCert(renewal_file, cli_config)
except (errors.CertStorageError, IOError): except (errors.CertStorageError, IOError):
logger.warning("Renewal conf file %s is broken. Skipping.", renewal_file) logger.warning("Renewal conf file %s is broken. Skipping.", renewal_file)
logger.info("Traceback was:\n%s", traceback.format_exc()) logger.debug("Traceback was:\n%s", traceback.format_exc())
continue continue
# TODO: Handle these differently depending on whether they are # TODO: Handle these differently depending on whether they are
# expired or still valid? # expired or still valid?
@@ -248,8 +248,10 @@ def _find_duplicative_certs(config, domains):
def _treat_as_renewal(config, domains): def _treat_as_renewal(config, domains):
"""Determine whether there are duplicated names and how to handle them """Determine whether there are duplicated names and how to handle
(renew, reinstall, newcert, or no action). them (renew, reinstall, newcert, or raising an error to stop
the client run if the user chooses to cancel the operation when
prompted).
:returns: Two-element tuple containing desired new-certificate behavior as :returns: Two-element tuple containing desired new-certificate behavior as
a string token ("reinstall", "renew", or "newcert"), plus either a string token ("reinstall", "renew", or "newcert"), plus either
@@ -852,6 +854,10 @@ def renew(cli_config, unused_plugins):
"renew specific certificates, use the certonly " "renew specific certificates, use the certonly "
"command. The renew verb may provide other options " "command. The renew verb may provide other options "
"for selecting certificates to renew in the future.") "for selecting certificates to renew in the future.")
if cli_config.csr is not None:
raise errors.Error("Currently, the renew verb cannot be used when "
"specifying a CSR file. Please try the certonly "
"command instead.")
for renewal_file in _renewal_conf_files(cli_config): for renewal_file in _renewal_conf_files(cli_config):
if not renewal_file.endswith(".conf"): if not renewal_file.endswith(".conf"):
continue continue