renewer: fix bug where renewer.conf wasn't read.

This commit is contained in:
Jakub Warmuz 2015-06-25 05:36:02 +00:00
parent 4de60f68ab
commit 38b497ef73
No known key found for this signature in database
GPG key ID: 2A7BAD3A489B52EA

View file

@ -137,8 +137,9 @@ def main(config=None, args=sys.argv[1:]):
print "Processing", i
if not i.endswith(".conf"):
continue
rc_config = configobj.ConfigObj(
os.path.join(cli_config.renewal_configs_dir, i))
rc_config = configobj.ConfigObj(cli_config.renewer_config_file)
rc_config.merge(configobj.ConfigObj(
os.path.join(cli_config.renewal_configs_dir, i)))
try:
# TODO: Before trying to initialize the RenewableCert object,
# we could check here whether the combination of the config