X-Git-Url: https://git.ralfj.de/lets-encrypt-tiny.git/blobdiff_plain/3e4fa8f0f27e3af00f40873e9cf64b0b0a31b5a6..refs/heads/master:/letsencrypt-tiny?ds=sidebyside diff --git a/letsencrypt-tiny b/letsencrypt-tiny index 6df989b..eef52e7 100755 --- a/letsencrypt-tiny +++ b/letsencrypt-tiny @@ -21,6 +21,7 @@ def keyfile(name): 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: @@ -64,7 +65,7 @@ def acme(keyfilename, certfilename, domains): try: # call acme-tiny as a script 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']]) + 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: @@ -124,7 +125,7 @@ def auto_renewal(live, staging): now = datetime.datetime.now() key_age = now - key_mtime(live) need_new_key = key_age >= max_key_age - if os.path.exists(live): + if os.path.exists(certfile(live)): cert_validity = cert_expiry(live) - now need_new_cert = cert_validity <= renew_cert_time else: