From 28dd8e74bdefd62307881f6e086af59db97a21a0 Mon Sep 17 00:00:00 2001
From: Jason Gerard DeRose <jderose@redhat.com>
Date: Mon, 27 Oct 2008 00:58:25 -0600
Subject: Env._bootstrap() now also sets Env.conf_default

---
 ipalib/config.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'ipalib/config.py')

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