X-Git-Url: https://git.ralfj.de/lets-encrypt-tiny.git/blobdiff_plain/4a2bbe08f681024557ddecdaa87a7da696aeec17..0a7958cbbe3105bbc8d079717af607b436804cbf:/letsencrypt-tiny?ds=sidebyside

diff --git a/letsencrypt-tiny b/letsencrypt-tiny
index 658eb07..484d99d 100755
--- a/letsencrypt-tiny
+++ b/letsencrypt-tiny
@@ -35,7 +35,7 @@ def make_backup(fname):
 
 def trigger_hook(hook):
     global config
-    exe = config['hooks'][hook]
+    exe = config['hooks'].get(hook)
     if exe is not None:
         subprocess.check_call([exe])
 
@@ -58,7 +58,7 @@ def acme(keyfilename, certfilename, domains):
     # Generating the CSR is done by a shell script
     exe = os.path.join(os.path.dirname(__file__), 'gencsr')
     csr = subprocess.check_output([exe, keyfilename] + domains)
-    assert not os.path.exists(csrfilename)
+    assert not os.path.exists(csrfilename), "The temporary CSR file {} still exists. It seems something went wrong on a previous request. You may want to remove the file manually.".format(csrfilename)
     with open(csrfilename, 'wb') as file:
         file.write(csr)
     # call acme-tiny as a script