1
0
mirror of https://github.com/certbot/certbot.git synced 2026-01-26 07:41:33 +03:00

add _set_config_dir

This commit is contained in:
Brad Warren
2017-08-10 16:17:46 -07:00
parent 25d1f6ec75
commit 2e8a8dfed5

View File

@@ -37,7 +37,7 @@ class Installer(plugins_common.Plugin):
def __init__(self, *args, **kwargs):
super(Installer, self).__init__(*args, **kwargs)
self.fixup = False
self.config_dir = self.conf("config-dir")
self.config_dir = None
self.additions = []
self.deletions = []
@@ -67,6 +67,7 @@ class Installer(plugins_common.Plugin):
"""
self._verify_postconf_available()
self._set_config_dir()
self.fn = self.find_postfix_cf()
self.raw_cf = open(self.fn).readlines()
@@ -135,6 +136,19 @@ class Installer(plugins_common.Plugin):
self.conf("config-utility"),
self.option_name("config-utility")))
def _set_config_dir(self):
"""Ensure self.config_dir is set to the correct path.
If the configuration directory to use was set by the user, we'll
use that value, otherwise, we'll find the default path using
'postconf'.
"""
if self.conf("config-dir") is None:
self.config_dir = self.get_config_var("config_directory")
else:
self.config_dir = self.conf("config-dir")
def find_postfix_cf(self):
"Search far and wide for the correct postfix configuration file"
return os.path.join(self.config_dir, "main.cf")