upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-09 00:32:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Don't read global renewer config file

Browse source
This commit is contained in:
Brad Warren 2015-10-13 18:39:23 -07:00
parent 0e6d652ce3
commit 2239ae9a68
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
letsencrypt/storage.py
View file

@ -108,17 +108,10 @@ class RenewableCert(object): # pylint: disable=too-many-instance-attributes
except configobj.ConfigObjError:
raise errors.CertStorageError(
"error parsing {0}".format(config_filename))
# TODO: Do we actually use anything from defaults and do we want to
# read further defaults from the systemwide renewal configuration
# file at this stage?
try:
self.configuration = config_with_defaults(
configobj.ConfigObj(cli_config.renewer_config_file))
self.configuration.merge(self.configfile)
except:
raise errors.CertStorageError(
"error parsing {0}".format(cli_config.renewer_config_file))
self.configuration = config_with_defaults(self.configfile)
if not all(x in self.configuration for x in ALL_FOUR):
raise errors.CertStorageError(