diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-16 10:01:43 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-16 10:01:43 -0400 |
commit | fbbd936841af6a4ae9ebdc52d4e87da60368353e (patch) | |
tree | d625e674b1cd81434e7f5a973421a91eb91ecb03 /src/lib/Bcfg2/Server/Core.py | |
parent | 6de50a235ed21de987488a2890b13f029d1962b4 (diff) | |
download | bcfg2-fbbd936841af6a4ae9ebdc52d4e87da60368353e.tar.gz bcfg2-fbbd936841af6a4ae9ebdc52d4e87da60368353e.tar.bz2 bcfg2-fbbd936841af6a4ae9ebdc52d4e87da60368353e.zip |
Bcfg2.settings: bcfg2-web.conf is the default, unless bcfg2-web.conf doesn't exit and bcfg2.conf does
Diffstat (limited to 'src/lib/Bcfg2/Server/Core.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 3 |
1 files changed, 2 insertions, 1 deletions
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 |