moepman/acertmgr
1
0
Fork 0
mirror of https://github.com/moepman/acertmgr.git synced 2025-01-01 04:21:51 +01:00
Code Releases Activity

correctly handle multiple domain names

Browse Source
This commit is contained in:
David Klaftenegger 2016-04-04 01:18:19 +02:00 committed by Markus Hauschild
parent a4c0bd6357
commit c2383d1d2c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
acertmgr.py
View File

@ -65,7 +65,8 @@ def cert_isValid(crt_file, ttl_days):
# @brief fetch new certificate from letsencrypt # @brief fetch new certificate from letsencrypt
# @param domain string containing the domain name # @param domain string containing the domain name
# @param settings the domain's configuration options # @param settings the domain's configuration options
def cert_get(domain, settings): def cert_get(domains, settings):
domain = domains.split(' ')[0]
print("Getting certificate for %s." % domain) print("Getting certificate for %s." % domain)
key_file = ACME_DIR + "server.key" key_file = ACME_DIR + "server.key"
@ -127,7 +128,7 @@ def cert_put(domain, settings):
crt_action = settings['action'] crt_action = settings['action']
key_file = ACME_DIR + "server.key" key_file = ACME_DIR + "server.key"
crt_final = ACME_DIR + "%s.crt" % domain crt_final = ACME_DIR + "%s.crt" % domain.split(' ')[0]
with open(crt_path, "w+") as crt_fd: with open(crt_path, "w+") as crt_fd:
for fmt in crt_format: for fmt in crt_format:
@ -198,18 +199,18 @@ if __name__ == "__main__":
actions = set() actions = set()
# check certificate validity and obtain/renew certificates if needed # check certificate validity and obtain/renew certificates if needed
for domain, domaincfgs in config['domains']: for domains, domaincfgs in config['domains']:
# skip domains without any output files # skip domains without any output files
if domaincfgs is None: if domaincfgs is None:
continue continue
crt_file = ACME_DIR + "%s.crt" % domain crt_file = ACME_DIR + "%s.crt" % domains.split(' ')[0]
ttl_days = int(config.get('ttl_days', 15)) ttl_days = int(config.get('ttl_days', 15))
if not cert_isValid(crt_file, ttl_days): if not cert_isValid(crt_file, ttl_days):
cert_get(domain, config) cert_get(domains, config)
for domaincfg in domaincfgs: for domaincfg in domaincfgs:
cfg = complete_config(domaincfg, config['defaults']) cfg = complete_config(domaincfg, config['defaults'])
if not target_isCurrent(cfg['path'], crt_file): if not target_isCurrent(cfg['path'], crt_file):
actions.add(cert_put(domain, cfg)) actions.add(cert_put(domains, cfg))
# run post-update actions # run post-update actions
for action in actions: for action in actions: