From a099dac8af50b69b3877d13c8c3087262edc4033 Mon Sep 17 00:00:00 2001 From: rootzoll Date: Mon, 13 Jul 2020 12:58:35 +0200 Subject: [PATCH] fix subscriptions section --- home.admin/config.scripts/blitz.subscriptions.ip2tor.py | 2 +- .../config.scripts/blitz.subscriptions.letsencrypt.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/home.admin/config.scripts/blitz.subscriptions.ip2tor.py b/home.admin/config.scripts/blitz.subscriptions.ip2tor.py index c64471c76..8290bbe19 100644 --- a/home.admin/config.scripts/blitz.subscriptions.ip2tor.py +++ b/home.admin/config.scripts/blitz.subscriptions.ip2tor.py @@ -417,7 +417,7 @@ def shopOrder(shopUrl, hostid, servicename, torTarget, duration, msatsFirst, msa else: print("# new toml file") subscriptions = {} - if "subscriptions_ip2tor" not in subs: + if "subscriptions_ip2tor" not in subscriptions: subscriptions['subscriptions_ip2tor'] = [] subscriptions['subscriptions_ip2tor'].append(subscription) subscriptions['shop_ip2tor'] = shopUrl diff --git a/home.admin/config.scripts/blitz.subscriptions.letsencrypt.py b/home.admin/config.scripts/blitz.subscriptions.letsencrypt.py index 249fd3b82..531ae0324 100644 --- a/home.admin/config.scripts/blitz.subscriptions.letsencrypt.py +++ b/home.admin/config.scripts/blitz.subscriptions.letsencrypt.py @@ -21,7 +21,7 @@ from blitzpy import RaspiBlitzConfig if len(sys.argv) <= 1 or sys.argv[1] == "-h" or sys.argv[1] == "help": print("# manage letsencrypt HTTPS certificates for raspiblitz") print("# blitz.subscriptions.letsencrypt.py create-ssh-dialog") - print("# blitz.subscriptions.ip2tor.py subscriptions-new dyndns|ip dnsservice id token") + print("# blitz.subscriptions.ip2tor.py subscriptions-new dyndns|ip duckdns|freedns id token") print("# blitz.subscriptions.ip2tor.py subscriptions-list") print("# blitz.subscriptions.ip2tor.py subscription-cancel id") print("# blitz.subscriptions.ip2tor.py subscription-detail id") @@ -113,7 +113,7 @@ def subscriptionsNew(ip, dnsservice, id, token): else: print("# new toml file") subscriptions = {} - if "subscriptions_letsencrypt" not in subs: + if "subscriptions_letsencrypt" not in subscriptions: subscriptions['subscriptions_letsencrypt'] = [] subscriptions['subscriptions_letsencrypt'].append(subscription) with open(SUBSCRIPTIONS_FILE, 'w') as writer: @@ -124,7 +124,7 @@ def subscriptionsNew(ip, dnsservice, id, token): eprint(e) raise BlitzError("fail on subscription storage",subscription, e) - print("# OK - BRIDGE READY: {0}:{1} -> {2}".format(bridge_ip, subscription['port'], torTarget)) + print("# OK - LETSENCRYPT DOMAIN IS READY") return subscription def subscriptionsCancel(id):