summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Admin/Init.py
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2009-02-11 20:02:36 +0000
committerSol Jerome <solj@ices.utexas.edu>2009-02-11 20:02:36 +0000
commitb3c4bc67a0ea6580291d9d7adf36e17f31731280 (patch)
tree59c0afa8dc4b8ef99e833132a8705a5a88ee8255 /src/lib/Server/Admin/Init.py
parent6cc7242be3e7c82f1ee473a1b85d06a5a23aa172 (diff)
downloadbcfg2-b3c4bc67a0ea6580291d9d7adf36e17f31731280.tar.gz
bcfg2-b3c4bc67a0ea6580291d9d7adf36e17f31731280.tar.bz2
bcfg2-b3c4bc67a0ea6580291d9d7adf36e17f31731280.zip
Update Init.py for new bcfg2.conf layout
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5073 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Admin/Init.py')
-rw-r--r--src/lib/Server/Admin/Init.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/lib/Server/Admin/Init.py b/src/lib/Server/Admin/Init.py
index 54692c126..5c969bee9 100644
--- a/src/lib/Server/Admin/Init.py
+++ b/src/lib/Server/Admin/Init.py
@@ -6,10 +6,7 @@ import Bcfg2.Options
config = '''
[server]
repository = %s
-structures = %s
-generators = %s
-# Uncomment to use the DBStats plugin (0.9.6pre2 and later)
-#plugins = DBStats
+plugins = %s
[statistics]
sendmailpath = %s
@@ -80,11 +77,10 @@ class Init(Bcfg2.Server.Admin.Mode):
__usage__ = "bcfg2-admin init"
options = {
'configfile': Bcfg2.Options.CFILE,
- 'gens' : Bcfg2.Options.SERVER_GENERATORS,
+ 'plugins' : Bcfg2.Options.SERVER_PLUGINS,
'proto' : Bcfg2.Options.SERVER_PROTOCOL,
'repo' : Bcfg2.Options.SERVER_REPOSITORY,
'sendmail' : Bcfg2.Options.SENDMAIL_PATH,
- 'struct' : Bcfg2.Options.SERVER_STRUCTURES,
}
def __call__(self, args):
@@ -136,7 +132,7 @@ class Init(Bcfg2.Server.Admin.Mode):
keypath = os.path.dirname(os.path.abspath(configfile))
confdata = config % (
- repo, ','.join(opts['struct']), ','.join(opts['gens']),
+ repo, ','.join(opts['plugins']),
opts['sendmail'], opts['proto'],
password, keypath, server_uri
)