fix rename calls

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

diff --git a/letsencrypt-tiny b/letsencrypt-tiny
index 033887e05452df5130186c7a45f1290802ba8835..4503a6ef4b29bac20aa4327afc7c325496efbd3d 100755 (executable)
--- a/letsencrypt-tiny
+++ b/letsencrypt-tiny
@@ -11,9 +11,9 @@ 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
     global config

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

 
 def keyfile(name):
     global config
 
 def keyfile(name):
     global config


@@ -30,7 +30,7 @@ def make_backup(fname):
         while True:
             backupfile = os.path.join(config['dirs']['backups'], backupname + "." + str(i))
             if not os.path.exists(backupfile):
         while True:
             backupfile = os.path.join(config['dirs']['backups'], backupname + "." + str(i))
             if not os.path.exists(backupfile):

-                os.rename(src = fname, dst = backupfile)
+                os.rename(fname, backupfile)

                 break
             elif i >= 100:
                 print("Somehow it's really hard to find a name for the backup file...")
                 break
             elif i >= 100:
                 print("Somehow it's really hard to find a name for the backup file...")


@@ -65,22 +65,6 @@ def acme(name, domains):
     make_backup(certfile(name))
     with open(certfile(name), 'wb') as f:
         f.write(signed_crt)
     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)
-    # 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
 
 def request_cert(name):
     global config


@@ -116,17 +100,9 @@ def check_staging():
     print("Unstaging '{}' to '{}'".format(staging, live))
     # unstage the key!
     make_backup(keyfile(live))
     print("Unstaging '{}' to '{}'".format(staging, live))
     # unstage the key!
     make_backup(keyfile(live))

-    os.rename(src = keyfile(staging), dst = keyfile(live))
+    os.rename(keyfile(staging), keyfile(live))

     make_backup(certfile(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
-    try:
-        os.rename(src = certfile(staging, 'chain'), dst = certfile(live, 'chain'))
-    except FileNotFoundError:
-        pass
+    os.rename(certfile(staging), certfile(live))

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