feat: failsafe issue certificate for local host

Author: casesolved-co-uk

management/ssl_certificates.py

@@ -1,13 +1,15 @@
 #!/usr/local/lib/mailinabox/env/bin/python
 # Utilities for installing and selecting SSL certificates.
 
+import sys
 import os
 import os.path
 import re
 import shutil
 import subprocess
 import tempfile
 
+from exclusiveprocess import Lock
 from utils import shell, safe_domain_name, sort_domains
 import idna
 
@@ -426,15 +428,8 @@ def provision_certificates(env, limit_domains):
 	return ret
 
 
-def provision_certificates_cmdline():
-	import sys
-	from exclusiveprocess import Lock
-
-	from utils import load_environment
-
-	Lock(die=True).forever()
-	env = load_environment()
-
+@Lock(die=True)
+def provision_certificates_cmdline(env):
 	quiet = False
 	domains = []
 
@@ -781,5 +776,16 @@ def idna_decode_dns_name(dns_name):
 
 
 if __name__ == "__main__":
+	from utils import load_environment
+	env = load_environment()
+
 	# Provision certificates.
-	provision_certificates_cmdline()
+	provision_certificates_cmdline(env)
+
+	# Failsafe
+	args = sys.argv[0:1]
+	if "-q" in sys.argv:
+		args.append('-q')
+	args.append(env['PRIMARY_HOSTNAME'])
+	sys.argv = args
+	provision_certificates_cmdline(env)