external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-05-27 17:00:53 +00:00
Code Issues Releases Wiki Activity

Merge e09230192f into 91d7151101

Browse Source
This commit is contained in:
Scott Bronson 2015-12-19 02:05:48 +00:00
commit f103f24cbd
1 changed files with 5 additions and 2 deletions

7
management/ssl_certificates.py
View File

@ -182,10 +182,13 @@ def get_certificates_to_provision(env):
domains.add(domain) domains.add(domain)
else: else:
cert = cert["certificate_object"] cert = cert["certificate_object"]
import sys
if cert.issuer == cert.subject: if cert.issuer == cert.subject:
# This is self-signed. Get a real one. # This is self-signed. Get a real one.
domains.add(domain) domains.add(domain)
elif "--replace-all" in sys.argv:
domains.add(domain)
# Valid certificate today, but is it expiring soon? # Valid certificate today, but is it expiring soon?
elif cert.not_valid_after-now < datetime.timedelta(days=14): elif cert.not_valid_after-now < datetime.timedelta(days=14):
domains.add(domain) domains.add(domain)
@ -709,4 +712,4 @@ def get_certificate_domains(cert):
if __name__ == "__main__": if __name__ == "__main__":
# Provision certificates. # Provision certificates.
provision_certificates_cmdline() provision_certificates_cmdline()