From 2239ae9a68d8b8e0b6e4400fe7bb80d3d33e6c54 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Tue, 13 Oct 2015 18:39:23 -0700 Subject: [PATCH] Don't read global renewer config file --- letsencrypt/storage.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/letsencrypt/storage.py b/letsencrypt/storage.py index 9b3290e2c..530cf9d0f 100644 --- a/letsencrypt/storage.py +++ b/letsencrypt/storage.py @@ -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(