From 1fff04ea9e95914c33c949fdfc7ddf72b7a9396b Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Tue, 15 Sep 2015 18:51:24 -0700 Subject: [PATCH 1/2] Change the renewal configuration directory Fixes #732 --- letsencrypt/constants.py | 2 +- letsencrypt/tests/renewer_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/letsencrypt/constants.py b/letsencrypt/constants.py index 0d00f2d75..6c67ce445 100644 --- a/letsencrypt/constants.py +++ b/letsencrypt/constants.py @@ -88,7 +88,7 @@ LIVE_DIR = "live" TEMP_CHECKPOINT_DIR = "temp_checkpoint" """Temporary checkpoint directory (relative to `IConfig.work_dir`).""" -RENEWAL_CONFIGS_DIR = "configs" +RENEWAL_CONFIGS_DIR = "renewal" """Renewal configs directory, relative to `IConfig.config_dir`.""" RENEWER_CONFIG_FILENAME = "renewer.conf" diff --git a/letsencrypt/tests/renewer_test.py b/letsencrypt/tests/renewer_test.py index 053f00ed8..761783d23 100644 --- a/letsencrypt/tests/renewer_test.py +++ b/letsencrypt/tests/renewer_test.py @@ -43,7 +43,7 @@ class BaseRenewableCertTest(unittest.TestCase): # TODO: maybe provide RenewerConfiguration.make_dirs? os.makedirs(os.path.join(self.tempdir, "live", "example.org")) os.makedirs(os.path.join(self.tempdir, "archive", "example.org")) - os.makedirs(os.path.join(self.tempdir, "configs")) + os.makedirs(os.path.join(self.tempdir, "renewal")) config = configobj.ConfigObj() for kind in ALL_FOUR: From 18adec0bf24daf4d38130e1e5d8819ff55950fc8 Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Wed, 16 Sep 2015 19:43:57 -0700 Subject: [PATCH 2/2] Fix paths in test cases --- .../letsencrypt_compatibility_test/util.py | 2 +- letsencrypt/tests/renewer_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/letsencrypt-compatibility-test/letsencrypt_compatibility_test/util.py b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/util.py index 43070cf03..6181da16b 100644 --- a/letsencrypt-compatibility-test/letsencrypt_compatibility_test/util.py +++ b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/util.py @@ -39,7 +39,7 @@ def create_le_config(parent_dir): def extract_configs(configs, parent_dir): """Extracts configs to a new dir under parent_dir and returns it""" - config_dir = os.path.join(parent_dir, "configs") + config_dir = os.path.join(parent_dir, "renewal") if os.path.isdir(configs): shutil.copytree(configs, config_dir, symlinks=True) diff --git a/letsencrypt/tests/renewer_test.py b/letsencrypt/tests/renewer_test.py index 761783d23..293b09537 100644 --- a/letsencrypt/tests/renewer_test.py +++ b/letsencrypt/tests/renewer_test.py @@ -49,7 +49,7 @@ class BaseRenewableCertTest(unittest.TestCase): for kind in ALL_FOUR: config[kind] = os.path.join(self.tempdir, "live", "example.org", kind + ".pem") - config.filename = os.path.join(self.tempdir, "configs", + config.filename = os.path.join(self.tempdir, "renewal", "example.org.conf") self.config = config