diff options
| author | Fabian Affolter <fabian@bernewireless.net> | 2010-12-14 00:54:57 +0100 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-01-05 20:40:50 -0600 |
| commit | bc1ee763eef9caa66b1c4ab846c6884515dc93c4 (patch) | |
| tree | c67d8d7722652ccca309631e87cd79489c9f0f24 /src/lib/Server/Admin/Init.py | |
| parent | 9aa7737a2840b5ce6688731f84ed49d558e3dc30 (diff) | |
| download | bcfg2-bc1ee763eef9caa66b1c4ab846c6884515dc93c4.tar.gz bcfg2-bc1ee763eef9caa66b1c4ab846c6884515dc93c4.tar.bz2 bcfg2-bc1ee763eef9caa66b1c4ab846c6884515dc93c4.zip | |
Plugins: Ordered defaults plugins
(cherry picked from commit 99bbe3f9d130bf9939489c4cd959373b1f3ce43f)
Diffstat (limited to 'src/lib/Server/Admin/Init.py')
| -rw-r--r-- | src/lib/Server/Admin/Init.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/lib/Server/Admin/Init.py b/src/lib/Server/Admin/Init.py index 1f00ce2a0..3a461681b 100644 --- a/src/lib/Server/Admin/Init.py +++ b/src/lib/Server/Admin/Init.py @@ -105,8 +105,15 @@ plugin_list = [ ] # Default list of plugins to use -default_plugins = ['SSHbase', 'Cfg', 'Pkgmgr', 'Rules', - 'Metadata', 'Base', 'Bundler'] +default_plugins = [ + 'Base', + 'Bundler' + 'Cfg', + 'Metadata', + 'Pkgmgr', + 'Rules', + 'SSHbase' + ] def gen_password(length): """Generates a random alphanumeric password with length characters.""" @@ -125,7 +132,7 @@ def create_key(hostname, keypath, certpath): os.chmod(keypath, 0600) def create_conf(confpath, confdata): - # don't overwrite existing bcfg2.conf file + # Don't overwrite existing bcfg2.conf file if os.path.exists(confpath): result = raw_input("\nWarning: %s already exists. " "Overwrite? [y/N]: " % confpath) @@ -253,7 +260,7 @@ class Init(Bcfg2.Server.Admin.Mode): plugin = plugin.strip() if not plugin in plugin_list: plugins_are_valid = False - print "ERROR: plugin %s not recognized" % plugin + print "ERROR: Plugin %s not recognized" % plugin if plugins_are_valid: break |