upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-05-28 04:34:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #772 from letsencrypt/renewal_config_dir

Browse source 
Change the renewal configuration directory
This commit is contained in:
James Kasten 2015-09-18 01:26:37 -04:00
commit 22260a82af
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
letsencrypt-compatibility-test/letsencrypt_compatibility_test/util.py
View file

@ -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)

2
letsencrypt/constants.py
View file

@ -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"

4
letsencrypt/tests/renewer_test.py
View file

@ -43,13 +43,13 @@ 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:
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