X-Git-Url: https://git.ralfj.de/lets-encrypt-tiny.git/blobdiff_plain/ced309aad271bf75269e224edc5f92ff7868187d..1b15f25eb3f15859f0e0c8f584dcd423fc24a11c:/letsencrypt-tiny

diff --git a/letsencrypt-tiny b/letsencrypt-tiny
index 78d38b7..d4e696d 100755
--- a/letsencrypt-tiny
+++ b/letsencrypt-tiny
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-## Call with "--help" for documentation.
+## See <https://www.ralfj.de/blog/2017/12/26/lets-encrypt.html> for documentation.
 
 import argparse, configparser, itertools, stat, os, os.path, sys, subprocess, datetime
 
@@ -63,7 +63,7 @@ def acme(keyfilename, certfilename, domains):
         file.write(csr)
     try:
         # call acme-tiny as a script
-        acme_tiny = os.path.join(config['acme']['acme-tiny'], 'acme_tiny.py')
+        acme_tiny = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'acme-tiny', 'acme_tiny.py')
         signed_crt = subprocess.check_output(["python", acme_tiny, "--quiet", "--account-key", accountkey, "--csr", csrfilename, "--acme-dir", config['acme']['challenge-dir']])
         # save new certificate
         make_backup(certfilename)
@@ -94,6 +94,7 @@ def request_cert(name):
     acme(keyfile(name), certfile(name), domains)
 
 def generate_key(name):
+    assert not os.path.exists(certfile(name)), "Don't make create a new key for an old cert"
     print("Generating new private key '{}'".format(name))
     openssl_genrsa(keyfile(name))
 
@@ -204,6 +205,7 @@ if __name__ == "__main__":
         live = config['files']['live']
         if not os.path.exists(keyfile(live)):
             generate_key(live)
+        if not os.path.exists(certfile(live)):
             request_cert(live)
             if args.hooks:
                 trigger_hook('post-certchange')