X-Git-Url: https://git.ralfj.de/lets-encrypt-tiny.git/blobdiff_plain/da8bb6f65ba6f1316f2517cde9a9f2dc389d18f3..HEAD:/letsencrypt-tiny?ds=inline diff --git a/letsencrypt-tiny b/letsencrypt-tiny index 2e8ea14..902639b 100755 --- a/letsencrypt-tiny +++ b/letsencrypt-tiny @@ -21,7 +21,7 @@ def keyfile(name): def make_backup(fname): if os.path.exists(fname): - os.makedirs(config['dirs']['backups']) + os.makedirs(config['dirs']['backups'], exist_ok = True) backupname = os.path.basename(fname) + "." + str(datetime.date.today()) i = 0 while True: @@ -101,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.''' - if not os.path.exists(keyfile(staging)): + if not (os.path.exists(keyfile(staging)) and os.path.exists(certfile(staging))): 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: