From fbbd936841af6a4ae9ebdc52d4e87da60368353e Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 16 Aug 2012 10:01:43 -0400 Subject: Bcfg2.settings: bcfg2-web.conf is the default, unless bcfg2-web.conf doesn't exit and bcfg2.conf does --- src/lib/Bcfg2/Server/Core.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/Server/Core.py') diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 3cb4854bd..377932614 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -106,7 +106,8 @@ class BaseCore(object): # generate Django ORM settings. this must be done _before_ we # load plugins - Bcfg2.settings.read_config(cfile=self.cfile, repo=self.datastore) + Bcfg2.settings.read_config(cfile=self.setup['web_configfile'], + repo=self.datastore) self._database_available = False # verify our database schema -- cgit v1.2.3-1-g7c22