From 39fc9d628fd0679ce577891dbd1227a7f57aef89 Mon Sep 17 00:00:00 2001 From: missytake Date: Tue, 19 Dec 2023 16:16:16 +0100 Subject: [PATCH] cmdeploy: only run cmdeploy dns after cmdeploy run --- cmdeploy/src/cmdeploy/dns.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmdeploy/src/cmdeploy/dns.py b/cmdeploy/src/cmdeploy/dns.py index 5a37ba8c..dee23e14 100644 --- a/cmdeploy/src/cmdeploy/dns.py +++ b/cmdeploy/src/cmdeploy/dns.py @@ -1,5 +1,3 @@ -import ipaddress - import requests import importlib import subprocess @@ -71,7 +69,11 @@ def show_dns(args, out): return "\n".join(lines) print("Checking your DKIM keys and DNS entries...") - acme_account_url = out.shell_output(f"{ssh} -- acmetool account-url") + try: + acme_account_url = out.shell_output(f"{ssh} -- acmetool account-url") + except subprocess.CalledProcessError: + print("Please run `cmdeploy run` first.") + return dkim_entry = read_dkim_entries(out.shell_output(f"{ssh} -- opendkim-genzone -F")) ipv6 = dns.get_ipv6()