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

Revert "--dry-run forces simulated renewal"

Browse Source 
This reverts commit ae6e938744.
This commit is contained in:
Brad Warren
2016-02-01 17:42:43 -08:00
parent 149ac79b8f
commit c4ce168001
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/cli.py
+7 -11
View File
@@ -405,20 +405,11 @@ def _auth_from_domains(le_client, config, domains):
# (which results in treating the request as a new certificate request). # (which results in treating the request as a new certificate request).
action, lineage = _treat_as_renewal(config, domains) action, lineage = _treat_as_renewal(config, domains)
if action == "reinstall" and not config.dry_run: if action == "reinstall":
# The lineage already exists; allow the caller to try installing # The lineage already exists; allow the caller to try installing
# it without getting a new certificate at all. # it without getting a new certificate at all.
return lineage, "reinstall" return lineage, "reinstall"
elif action == "newcert": elif action == "renew":
# TREAT AS NEW REQUEST
lineage = le_client.obtain_and_enroll_certificate(domains)
if lineage is False:
raise errors.Error("Certificate could not be obtained")
else:
assert action == "renew" or config.dry_run, "invalid auth command"
if config.dry_run and action == "reinstall":
logger.info("Cert not due for renewal, but "
"simulating renewal for dry run")
original_server = lineage.configuration["renewalparams"]["server"] original_server = lineage.configuration["renewalparams"]["server"]
_avoid_invalidating_lineage(config, lineage, original_server) _avoid_invalidating_lineage(config, lineage, original_server)
# TODO: schoen wishes to reuse key - discussion # TODO: schoen wishes to reuse key - discussion
@@ -438,6 +429,11 @@ def _auth_from_domains(le_client, config, domains):
# TODO: Check return value of save_successor # TODO: Check return value of save_successor
# TODO: Also update lineage renewal config with any relevant # TODO: Also update lineage renewal config with any relevant
# configuration values from this attempt? <- Absolutely (jdkasten) # configuration values from this attempt? <- Absolutely (jdkasten)
elif action == "newcert":
# TREAT AS NEW REQUEST
lineage = le_client.obtain_and_enroll_certificate(domains)
if lineage is False:
raise errors.Error("Certificate could not be obtained")
if not config.dry_run: if not config.dry_run:
_report_new_cert(lineage.cert, lineage.fullchain) _report_new_cert(lineage.cert, lineage.fullchain)