From b3c4bc67a0ea6580291d9d7adf36e17f31731280 Mon Sep 17 00:00:00 2001
From: Sol Jerome <solj@ices.utexas.edu>
Date: Wed, 11 Feb 2009 20:02:36 +0000
Subject: 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
---
 src/lib/Options.py           | 17 +++++++++++------
 src/lib/Server/Admin/Init.py | 10 +++-------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/lib/Options.py b/src/lib/Options.py
index c8716bdeb..3953effee 100644
--- a/src/lib/Options.py
+++ b/src/lib/Options.py
@@ -180,12 +180,17 @@ SERVER_REPOSITORY = Option('Server repository path', '/var/lib/bcfg2',
 SERVER_VCS = Option('Server vcs support', cf=('server', 'vcs'),
                     default='default')
 SERVER_PLUGINS = Option('Server plugin list', cf=('server', 'plugins'),
-                           default=[], cook=list_split)
-SERVER_GENERATORS = Option('Server generator list', cf=('server', 'generators'),
-                           default=['SSHbase', 'Cfg', 'Pkgmgr', 'Rules'],
-                           cook=list_split)
-SERVER_STRUCTURES = Option('Server structure list', cf=('server', 'structures'),
-                           default=['Bundler', 'Base'], cook=list_split)
+                        # default server plugins
+                        default=[
+                                 'Base',
+                                 'Bundler',
+                                 'Cfg',
+                                 'Metadata',
+                                 'Pkgmgr',
+                                 'Rules',
+                                 'SSHbase',
+                                ],
+                        cook=list_split)
 SERVER_MCONNECT = Option('Server Metadata Connector list', cook=list_split,
                          cf=('server', 'connectors'), default=['Probes'], )
 SERVER_FILEMONITOR = Option('Server file monitor', cf=('server', 'filemonitor'),
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 
                     )
-- 
cgit v1.2.3-1-g7c22