only attempt unstaging if both key and cert exist

[lets-encrypt-tiny.git] / letsencrypt-tiny

diff --git a/letsencrypt-tiny b/letsencrypt-tiny
index 7ca3f556f821cd62b14724f4ca75bf03610f3dcf..902639bec2d4b6c79165a1579773e3edaec2df52 100755 (executable)
--- a/letsencrypt-tiny
+++ b/letsencrypt-tiny
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
 #!/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
 
 
 import argparse, configparser, itertools, stat, os, os.path, sys, subprocess, datetime
 


@@ -21,6 +21,7 @@ def keyfile(name):
 
 def make_backup(fname):
     if os.path.exists(fname):
 
 def make_backup(fname):
     if os.path.exists(fname):

+        os.makedirs(config['dirs']['backups'], exist_ok = True)

         backupname = os.path.basename(fname) + "." + str(datetime.date.today())
         i = 0
         while True:
         backupname = os.path.basename(fname) + "." + str(datetime.date.today())
         i = 0
         while True:


@@ -63,8 +64,8 @@ def acme(keyfilename, certfilename, domains):
         file.write(csr)
     try:
         # call acme-tiny as a script
         file.write(csr)
     try:
         # call acme-tiny as a script

-        acme_tiny = os.path.join(config['acme']['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']])
+        acme_tiny = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'acme-tiny', 'acme_tiny.py')
+        signed_crt = subprocess.check_output(["python3", acme_tiny, "--quiet", "--account-key", accountkey, "--csr", csrfilename, "--acme-dir", config['acme']['challenge-dir']])

         # save new certificate
         make_backup(certfilename)
         with open(certfilename, 'wb') as f:
         # save new certificate
         make_backup(certfilename)
         with open(certfilename, 'wb') as f:


@@ -100,9 +101,9 @@ def generate_key(name):
 
 def check_staging(live, staging):
     '''Returns 0 if nothing was done, 1 if a stage key is present but has to be kept, 2 is a stage key was unstaged.'''
 
 def check_staging(live, staging):
     '''Returns 0 if nothing was done, 1 if a stage key is present but has to be kept, 2 is a stage key was unstaged.'''

-    if not os.path.exists(keyfile(staging)):
+    if not (os.path.exists(keyfile(staging)) and os.path.exists(certfile(staging))):

         return 0
         return 0

-    
+

     staging_time = datetime.timedelta(hours = int(config['timing'].get('staging-hours', 0)))
     key_age = datetime.datetime.now() - key_mtime(staging)
     if key_age < staging_time:
     staging_time = datetime.timedelta(hours = int(config['timing'].get('staging-hours', 0)))
     key_age = datetime.datetime.now() - key_mtime(staging)
     if key_age < staging_time:


@@ -123,9 +124,12 @@ def auto_renewal(live, staging):
     # determine what to do
     now = datetime.datetime.now()
     key_age = now - key_mtime(live)
     # determine what to do
     now = datetime.datetime.now()
     key_age = now - key_mtime(live)

-    cert_validity = cert_expiry(live) - now

     need_new_key = key_age >= max_key_age
     need_new_key = key_age >= max_key_age

-    need_new_cert = cert_validity <= renew_cert_time
+    if os.path.exists(certfile(live)):
+        cert_validity = cert_expiry(live) - now
+        need_new_cert = cert_validity <= renew_cert_time
+    else:
+        need_new_cert = True

     if need_new_cert and key_age + renew_cert_time >= max_key_age:
         # We are about to request a new certificate, and within <renew_cert_time>, we need a new key: Get the new key now
         need_new_key = True
     if need_new_cert and key_age + renew_cert_time >= max_key_age:
         # We are about to request a new certificate, and within <renew_cert_time>, we need a new key: Get the new key now
         need_new_key = True