X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.bin%2Fle-renew;h=58e687b0b7a34ca56356ed60efcbe3fc283515ce;hb=refs%2Fheads%2Fmain;hp=acc95678ef38c016e7b4aa0bc1d8bc195ed74239;hpb=881cee1eef549c096006e2e3bc02ecfcd1195618;p=home.git

diff --git a/.bin/le-renew b/.bin/le-renew
index acc9567..58e687b 100755
--- a/.bin/le-renew
+++ b/.bin/le-renew
@@ -137,16 +137,24 @@ def process_domain(domain, dry_run=False):
         cmd += ['-d', d]
     if delta.days < 30:
         logging.info('%s: renewing', domain)
-        logging.info('%s: %s', domain, cmd)
+        logging.info('%s: %s', domain, ' '.join(cmd))
         if not dry_run:
-            subprocess.check_call(cmd)
+            try:
+                subprocess.check_call(cmd)
+            except subprocess.CalledProcessError:
+                logging.error('failed', exc_info=True)
+                return 0
             ret = 1
         # Try to revoke the old one.
-        cmd = ['certbot', 'revoke', '--cert-path', cert_path]
+        cmd = ['certbot', 'revoke', '--no-delete-after-revoke', '--cert-path',
+               cert_path]
         logging.info('%s: revoking old cert', domain)
-        logging.info('%s: %s', domain, cmd)
+        logging.info('%s: %s', domain, ' '.join(cmd))
         if not dry_run:
-            subprocess.check_call(cmd)
+            try:
+                subprocess.check_call(cmd, stdin=open('/dev/null', 'r'))
+            except subprocess.CalledProcessError:
+                logging.error('failed', exc_info=True)
     else:
         logging.info('%s: up-to-date!', domain)