Env._bootstrap() now also sets Env.conf_default

2 files changed, 9 insertions, 6 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):
         """
diff --git a/ipalib/constants.py b/ipalib/constants.py
index e7b370f17..4942cc9b7 100644
--- a/ipalib/constants.py
+++ b/ipalib/constants.py
@@ -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)