Commit 9b472204 authored by ale's avatar ale

Fix bug that caused run-fsm to ignore INCLUDE_DOMAINS

parent 8f229f46
Pipeline #1217 failed with stage
in 54 seconds
......@@ -472,6 +472,7 @@ def run_acme(queue, credstore, state_machine, all_domains, san_domains, now=None
pending_task_domains = set()
for obj in queue.get_tasks():
pending_task_domains.add(obj['cn'])
log.info('recovered task %s from queue', obj['cn'])
# Note: the choice of 'run_all' here serves to limit our interaction with
# letsencrypt to 1 domain at a time, if possible.
if state_machine.run_all(obj) == 'done':
......@@ -511,4 +512,6 @@ def run_acme(queue, credstore, state_machine, all_domains, san_domains, now=None
elif force:
log.info('forcing renewal of certificate for domain %s...', cn)
queue.add_task(cn, 'renew', san)
else:
log.info('nothing to do for domain %s (expiration: %s)', cn, expire_at)
......@@ -97,8 +97,7 @@ def main():
if opts.domain:
domains = [opts.domain]
else:
domains = itertools.chain(
config['INCLUDE_DOMAINS'], _all_domains(config['EXCLUDE_DOMAINS']))
domains = config['INCLUDE_DOMAINS'] + list(_all_domains(config['EXCLUDE_DOMAINS']))
for domain, san in config['SAN_DOMAINS'].iteritems():
if domain not in domains:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment