From 94e386ae6abd4c37bef5510ad86c74d55d97523a Mon Sep 17 00:00:00 2001 From: rootzoll Date: Tue, 14 Jul 2020 17:52:21 +0200 Subject: [PATCH] use popen --- .../config.scripts/blitz.subscriptions.letsencrypt.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/home.admin/config.scripts/blitz.subscriptions.letsencrypt.py b/home.admin/config.scripts/blitz.subscriptions.letsencrypt.py index 8a861e573..21872ca33 100644 --- a/home.admin/config.scripts/blitz.subscriptions.letsencrypt.py +++ b/home.admin/config.scripts/blitz.subscriptions.letsencrypt.py @@ -109,10 +109,11 @@ def subscriptionsNew(ip, dnsservice, id, token, target): duckDNSupdate(getsubdomain(id), token, realip) # run the ACME script - acmeResult=subprocess.check_output(["/home/admin/config.scripts/bonus.letsencrypt.sh", "issue-cert", dnsservice, id, token, target]) - if acmeResult != 0: - time.sleep(6) - raise BlitzError("letsancrypt acme failed", acmeResult) + acmeResult=subprocess.Popen(["/home/admin/config.scripts/bonus.letsencrypt.sh", "issue-cert", dnsservice, id, token, target], stdout=subprocess.PIPE) + out, err = acmeResult.communicate() + if out.find("error=") > -1: + time.sleep(6) + raise BlitzError("letsancrypt acme failed", out) # create subscription data for storage subscription = {} @@ -170,7 +171,7 @@ def subscriptionsCancel(id): out, err = acmeResult.communicate() if out.find("error=") > -1: time.sleep(6) - raise BlitzError("letsancrypt acme failed", acmeResult) + raise BlitzError("letsancrypt acme failed", out) # persist change with open(SUBSCRIPTIONS_FILE, 'w') as writer: