fix python binary name

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

diff --git a/letsencrypt-tiny b/letsencrypt-tiny
index 6df989b772fa52439947d3a95650e41f6cb0f82e..b0b98944b2ca88297564948662eca2f3f71177ba 100755 (executable)
--- a/letsencrypt-tiny
+++ b/letsencrypt-tiny
@@ -64,7 +64,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')
     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:
         # save new certificate
         make_backup(certfilename)
         with open(certfilename, 'wb') as f:


@@ -124,7 +124,7 @@ def auto_renewal(live, staging):
     now = datetime.datetime.now()
     key_age = now - key_mtime(live)
     need_new_key = key_age >= max_key_age
     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:
         cert_validity = cert_expiry(live) - now
         need_new_cert = cert_validity <= renew_cert_time
     else: