external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-22 02:17:26 +00:00
Code Issues Releases Wiki Activity

tls: hide extra reasons why domains aren't getting a new certificate during setup

Browse Source
This commit is contained in:
Joshua Tauberer 2016-01-14 07:21:08 -05:00
parent 2ad7d0830e
commit faaa74c3a7
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
management/ssl_certificates.py
View File

@ -253,7 +253,7 @@ def get_certificates_to_provision(env, show_extended_problems=True, force_domain
return (domains, problems) return (domains, problems)
def provision_certificates(env, agree_to_tos_url=None, logger=None, force_domains=None, jsonable=False): def provision_certificates(env, agree_to_tos_url=None, logger=None, show_extended_problems=True, force_domains=None, jsonable=False):
import requests.exceptions import requests.exceptions
import acme.messages import acme.messages
@ -261,7 +261,7 @@ def provision_certificates(env, agree_to_tos_url=None, logger=None, force_domain
# What domains should we provision certificates for? And what # What domains should we provision certificates for? And what
# errors prevent provisioning for other domains. # errors prevent provisioning for other domains.
domains, problems = get_certificates_to_provision(env, force_domains=force_domains) domains, problems = get_certificates_to_provision(env, force_domains=force_domains, show_extended_problems=show_extended_problems)
# Exit fast if there is nothing to do. # Exit fast if there is nothing to do.
if len(domains) == 0: if len(domains) == 0:
@ -405,12 +405,16 @@ def provision_certificates_cmdline():
verbose = False verbose = False
headless = False headless = False
force_domains = None force_domains = None
show_extended_problems = True
args = list(sys.argv) args = list(sys.argv)
args.pop(0) # program name args.pop(0) # program name
if args and args[0] == "-v": if args and args[0] == "-v":
verbose = True verbose = True
args.pop(0) args.pop(0)
if args and args[0] == "q":
show_extended_problems = False
args.pop(0)
if args and args[0] == "--headless": if args and args[0] == "--headless":
headless = True headless = True
args.pop(0) args.pop(0)
@ -429,7 +433,7 @@ def provision_certificates_cmdline():
def my_logger(message): def my_logger(message):
if verbose: if verbose:
print(">", message) print(">", message)
status = provision_certificates(env, agree_to_tos_url=agree_to_tos_url, logger=my_logger, force_domains=force_domains) status = provision_certificates(env, agree_to_tos_url=agree_to_tos_url, logger=my_logger, force_domains=force_domains, show_extended_problems=show_extended_problems)
agree_to_tos_url = None # reset to prevent infinite looping agree_to_tos_url = None # reset to prevent infinite looping
if not status["requests"]: if not status["requests"]:

3
setup/start.sh
View File

@ -117,7 +117,8 @@ tools/dns_update
tools/web_update tools/web_update
# If DNS is already working, try to provision TLS certficates from Let's Encrypt. # If DNS is already working, try to provision TLS certficates from Let's Encrypt.
management/ssl_certificates.py # Suppress extra reasons why domains aren't getting a new certificate.
management/ssl_certificates.py -q
# If there aren't any mail users yet, create one. # If there aren't any mail users yet, create one.
source setup/firstuser.sh source setup/firstuser.sh