diff options
| author | Jason Gerard DeRose <jderose@redhat.com> | 2008-10-27 00:58:25 -0600 |
|---|---|---|
| committer | Jason Gerard DeRose <jderose@redhat.com> | 2008-10-27 00:58:25 -0600 |
| commit | 28dd8e74bdefd62307881f6e086af59db97a21a0 (patch) | |
| tree | ee2eb935d5e07bfa867374ce65d1af9804bf839d /ipalib/config.py | |
| parent | c8b3f6516513dc3e5948fe8280c3f159ad122684 (diff) | |
| download | freeipa-28dd8e74bdefd62307881f6e086af59db97a21a0.tar.gz freeipa-28dd8e74bdefd62307881f6e086af59db97a21a0.tar.xz freeipa-28dd8e74bdefd62307881f6e086af59db97a21a0.zip | |
Env._bootstrap() now also sets Env.conf_default
Diffstat (limited to 'ipalib/config.py')
| -rw-r--r-- | ipalib/config.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ipalib/config.py b/ipalib/config.py index 71d3024cd..7bb3e072a 100644 --- a/ipalib/config.py +++ b/ipalib/config.py @@ -178,12 +178,14 @@ class Env(object): self.in_tree = False if 'context' not in self: self.context = 'default' + if self.in_tree: + base = self.dot_ipa + else: + base = path.join('/', 'etc', 'ipa') if 'conf' not in self: - name = '%s.conf' % self.context - if self.in_tree: - self.conf = path.join(self.dot_ipa, name) - else: - self.conf = path.join('/', 'etc', 'ipa', name) + self.conf = path.join(base, '%s.conf' % self.context) + if 'conf_default' not in self: + self.conf_default = path.join(base, 'default.conf') def _finalize_core(self, **defaults): """ |