external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-12 17:07:23 +01:00
Code Issues Releases Wiki Activity

dont save the CSR generated to make self-signed certificates for non-primary domains (it has no value and might be confusing)

Browse Source
This commit is contained in:
Joshua Tauberer
2015-01-31 13:24:26 +00:00
parent a3e526e818
commit 3187053b3a
4 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
management/status_checks.py
View File

@@ -458,7 +458,7 @@ def check_ssl_cert(domain, env):
if query_dns(domain, "A", None) not in (env['PUBLIC_IP'], None): return
# Where is the SSL stored?
ssl_key, ssl_certificate, ssl_csr_path = get_domain_ssl_files(domain, env)
ssl_key, ssl_certificate = get_domain_ssl_files(domain, env)
if not os.path.exists(ssl_certificate):
env['out'].print_error("The SSL certificate file for this domain is missing.")
@@ -707,7 +707,7 @@ if __name__ == "__main__":
domain = env['PRIMARY_HOSTNAME']
if query_dns(domain, "A") != env['PUBLIC_IP']:
sys.exit(1)
ssl_key, ssl_certificate, ssl_csr_path = get_domain_ssl_files(domain, env)
ssl_key, ssl_certificate = get_domain_ssl_files(domain, env)
if not os.path.exists(ssl_certificate):
sys.exit(1)
cert_status, cert_status_details = check_certificate(domain, ssl_certificate, ssl_key)