allow acmettol to not be present durinig initialization

deltachat · Jul 8, 2024 · 6dedffc · 6dedffc
1 parent 039ef7c
commit 6dedffc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/cmdeploy/src/cmdeploy/cmdeploy.py b/cmdeploy/src/cmdeploy/cmdeploy.py
@@ -74,9 +74,8 @@ def dns_cmd_options(parser):
 
 
 def dns_cmd(args, out):
-    """Generate dns zone file."""
-    exit_code = show_dns(args, out)
-    exit(exit_code)
+    """Check DNS entries and optionally generate dns zone file."""
+    show_dns(args, out)
 
 
 def status_cmd(args, out):

diff --git a/cmdeploy/src/cmdeploy/remote_funcs.py b/cmdeploy/src/cmdeploy/remote_funcs.py
@@ -11,7 +11,7 @@
 
 import re
 import socket
-from subprocess import check_output
+from subprocess import CalledProcessError, check_output
 
 
 def shell(command):
@@ -26,7 +26,11 @@ def get_systemd_running():
 def perform_initial_checks(mail_domain):
     res = {}
 
-    res["acme_account_url"] = shell("acmetool account-url")
+    try:
+        res["acme_account_url"] = shell("acmetool account-url")
+    except CalledProcessError:
+        res["acme_account_url"] = "notset"
+
     shell("apt-get install -y dnsutils")
     shell("unbound-control flush_zone {mail_domain}")