1
0
mirror of https://github.com/moepman/acertmgr.git synced 2024-06-01 14:32:34 +02:00

Handle empty domain config

This commit is contained in:
Markus 2016-01-10 17:36:20 +01:00
parent c7efda7b61
commit 57440e1513

View File

@ -107,14 +107,16 @@ if __name__ == "__main__":
if config_file.endswith(".conf"): if config_file.endswith(".conf"):
with open(ACME_CONFD + config_file) as config_fd: with open(ACME_CONFD + config_file) as config_fd:
config['domains'].update(yaml.load(config_fd)) config['domains'].update(yaml.load(config_fd))
print(str(config)) #print(str(config))
# check certificate validity and obtain/renew certificates if needed # check certificate validity and obtain/renew certificates if needed
for domain, domaincfgs in config['domains'].iteritems(): for domain, domaincfgs in config['domains'].iteritems():
crt_file = ACME_DIR + "%s.crt" % domain crt_file = ACME_DIR + "%s.crt" % domain
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) # don't get certs for domains without any output files
for domaincfg in domaincfgs: if domaincfgs:
cfg = complete_config(domaincfg, config['defaults']) cert_get(domain, config)
cert_put(domain, cfg) for domaincfg in domaincfgs:
cfg = complete_config(domaincfg, config['defaults'])
cert_put(domain, cfg)