diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2004-08-31 19:02:04 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2004-08-31 19:02:04 +0000 |
| commit | 362c894c2679f365d2905fa6357a9ba2419a1d84 (patch) | |
| tree | 1dedd11d1a17fbe906c09d40f1b14dcb737c7605 | |
| parent | a1b3a3af1c5cc7bb845d496535e958bed5291ada (diff) | |
| download | bcfg2-362c894c2679f365d2905fa6357a9ba2419a1d84.tar.gz bcfg2-362c894c2679f365d2905fa6357a9ba2419a1d84.tar.bz2 bcfg2-362c894c2679f365d2905fa6357a9ba2419a1d84.zip | |
add config file location handling
(Logical change 1.50)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@291 ce84e21b-d406-0410-9b95-82705330c041
| -rw-r--r-- | src/sbin/Bcfg2Server | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sbin/Bcfg2Server b/src/sbin/Bcfg2Server index 6d2329789..4debe1f07 100644 --- a/src/sbin/Bcfg2Server +++ b/src/sbin/Bcfg2Server @@ -4,7 +4,7 @@ from socket import gethostbyaddr, herror from string import split from syslog import syslog, LOG_INFO, LOG_ERR -from sys import exit, exc_info +from sys import argv, exit, exc_info from time import time from traceback import extract_tb from ConfigParser import ConfigParser @@ -26,7 +26,7 @@ class BcfgServer(Server): def __setup__(self): c = ConfigParser() - c.read(['/etc/bcfg2.conf']) + c.read([self.kwargs.get('configfile', '/etc/bcfg2.conf')]) repo = c.get('server','repository') generators = split(c.get('server','generators'),',') structures = split(c.get('server', 'structures'),',') @@ -112,7 +112,7 @@ class BcfgServer(Server): if __name__ == '__main__': if '--daemon' in argv: daemonize('/dev/null') - server = BcfgServer() + server = BcfgServer(configfile='/home/desai/dev/bcfg2/examples/bcfg2.conf') for i in range(10): server.__progress__() server.ServeForever() |