IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Env._bootstrap() now also sets Env.conf_default

Browse Source
This commit is contained in:
Jason Gerard DeRose
2008-10-27 00:58:25 -06:00
parent c8b3f65165
commit 28dd8e74bd
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ipalib/config.py
View File

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

3
ipalib/constants.py
View File

@@ -79,7 +79,8 @@ DEFAULT_CONFIG = (
# Set in Env._bootstrap():
('in_tree', None), # Whether or not running in-tree (bool)
('context', None), # Name of context, default is 'default'
('conf', None), # Path to configuration file
('conf', None), # Path to config file
('conf_default', None), # Path to common default config file
# Set in Env._finalize_core():
('in_server', None), # Whether or not running in-server (bool)