let the hooks handle the combined file generation

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

diff --git a/letsencrypt-tiny b/letsencrypt-tiny
index 15aadcb28cc67864129a34bcbcac79f051a42479..57a2e60269ffab56dde4ae2986399c70b251f29b 100755 (executable)
--- a/letsencrypt-tiny
+++ b/letsencrypt-tiny
@@ -11,7 +11,7 @@ def readConfig(fname, defSection = 'DEFAULT'):
         config.read_file(stream)
     return config
 
         config.read_file(stream)
     return config
 

-def certfile(name, suff = None):
+def certfile(name):

     global config
     return os.path.join(config['dirs']['certs'], name + ".crt" + ('' if suff is None else '+'+suff) )
 
     global config
     return os.path.join(config['dirs']['certs'], name + ".crt" + ('' if suff is None else '+'+suff) )
 


@@ -60,26 +60,18 @@ 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:
         f.write(signed_crt)
     # save new certificate
     make_backup(certfile(name))
     with open(certfile(name), 'wb') as f:
         f.write(signed_crt)

-    # append DH params
-    dhfile = config['DEFAULT'].get('dh-params')
-    if dhfile is not None:
-        with open(dhfile, 'rb') as f:
-            dh = f.read()
-        with open(certfile(name, 'dh'), 'wb') as f:
-            f.write(signed_crt)
-            f.write(dh)

 
 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):


@@ -111,10 +103,6 @@ def check_staging():
     os.rename(src = keyfile(staging), dst = keyfile(live))
     make_backup(certfile(live))
     os.rename(src = certfile(staging), dst = certfile(live))
     os.rename(src = keyfile(staging), dst = keyfile(live))
     make_backup(certfile(live))
     os.rename(src = certfile(staging), dst = certfile(live))

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

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