add support for generating crt+chain files

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

diff --git a/letsencrypt-tiny b/letsencrypt-tiny
index 15aadcb28cc67864129a34bcbcac79f051a42479..033887e05452df5130186c7a45f1290802ba8835 100755 (executable)
--- a/letsencrypt-tiny
+++ b/letsencrypt-tiny
@@ -60,7 +60,7 @@ def acme(name, domains):
         file.write(csr)
     # call acme-tiny as a script
     acme_tiny = os.path.join(config['acme']['acme-tiny'], 'acme_tiny.py')
         file.write(csr)
     # call acme-tiny as a script
     acme_tiny = os.path.join(config['acme']['acme-tiny'], 'acme_tiny.py')

-    signed_crt = subprocess.check_output([acme_tiny, "--quiet", "--account-key", config['acme']['account-key'], "--csr", csrfile(name), "--acme-dir", config['acme']['challenge-dir']])
+    signed_crt = subprocess.check_output(["python", acme_tiny, "--quiet", "--account-key", config['acme']['account-key'], "--csr", csrfile(name), "--acme-dir", config['acme']['challenge-dir']])

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


@@ -73,13 +73,21 @@ def acme(name, domains):
         with open(certfile(name, 'dh'), 'wb') as f:
             f.write(signed_crt)
             f.write(dh)
         with open(certfile(name, 'dh'), 'wb') as f:
             f.write(signed_crt)
             f.write(dh)

+    # append chain
+    chainfile = config['DEFAULT'].get('chain')
+    if chainfile is not None:
+        with open(chainfile, 'rb') as f:
+            chain = f.read()
+        with open(certfile(name, 'chain'), 'wb') as f:
+            f.write(signed_crt)
+            f.write(chain)

 
 def request_cert(name):
     global config
     if not os.path.exists(keyfile(name)):
         raise Exception("No such key: {}".format(name))
     domains = config['DEFAULT']['domains'].split()
 
 def request_cert(name):
     global config
     if not os.path.exists(keyfile(name)):
         raise Exception("No such key: {}".format(name))
     domains = config['DEFAULT']['domains'].split()

-    print("Obtaining certificate '{}' for domains {}".format(name, ' '.join(domains)))
+    print("Obtaining certificate '{}' for domains: {}".format(name, ' '.join(domains)))

     acme(name, domains)
 
 def generate_key(name):
     acme(name, domains)
 
 def generate_key(name):


@@ -115,6 +123,10 @@ def check_staging():
         os.rename(src = certfile(staging, 'dh'), dst = certfile(live, 'dh'))
     except FileNotFoundError:
         pass
         os.rename(src = certfile(staging, 'dh'), dst = certfile(live, 'dh'))
     except FileNotFoundError:
         pass

+    try:
+        os.rename(src = certfile(staging, 'chain'), dst = certfile(live, 'chain'))
+    except FileNotFoundError:
+        pass

     return 2
 
 def auto_renewal():
     return 2
 
 def auto_renewal():