From e7f97ab238be57cfc99cc73f979e1b67d3cb0e80 Mon Sep 17 00:00:00 2001 From: Peter Linss Date: Thu, 8 Mar 2018 07:29:34 -0800 Subject: [PATCH] only skip certificate installation when keys altered and no certificates issued (allow dhparam & hpkp verification to happen otherwise) --- acmebot | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/acmebot b/acmebot index 33a2564..cfae96b 100755 --- a/acmebot +++ b/acmebot @@ -113,7 +113,7 @@ class AcmeManager(object): def __init__(self): self.script_dir = os.path.dirname(os.path.realpath(__file__)) self.script_name = os.path.basename(__file__) - self.script_version = '1.10.0' + self.script_version = '1.10.1' self._color_codes = { 'black': 30, @@ -1942,11 +1942,8 @@ class AcmeManager(object): for private_key_data in processed_keys: private_key_name = private_key_data.name - if (not private_key_data.issued_certificates): - if (private_key_data.generated_key or private_key_data.rolled_key): - self._warn('No certificates issued for private key ', private_key_name, ' skipping key updates\n') - else: - self._debug('No certificates issued for private key ', private_key_name, '\n') + if ((not private_key_data.issued_certificates) and (private_key_data.generated_key or private_key_data.rolled_key)): + self._warn('No certificates issued for private key ', private_key_name, ' skipping key updates\n') self._clear_hooks() continue