summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-07-19 17:23:41 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-07-19 17:23:41 -0500
commit1450bd76eec59d409bdf93e5e9982ca3ec852f2b (patch)
treec212e86822023ec23b4f15c6a9dbd3a2fd6d1038 /src
parent65c380c024f3642cb76cbc9ee5741e3cdfea3b87 (diff)
downloadbcfg2-1450bd76eec59d409bdf93e5e9982ca3ec852f2b.tar.gz
bcfg2-1450bd76eec59d409bdf93e5e9982ca3ec852f2b.tar.bz2
bcfg2-1450bd76eec59d409bdf93e5e9982ca3ec852f2b.zip
Admin/Init: Add listen_all option
Some of these changes were suggested in github issue #29. Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Admin/Init.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Init.py b/src/lib/Bcfg2/Server/Admin/Init.py
index 6175d8ed0..c76e54569 100644
--- a/src/lib/Bcfg2/Server/Admin/Init.py
+++ b/src/lib/Bcfg2/Server/Admin/Init.py
@@ -20,6 +20,8 @@ from Bcfg2.Compat import input # pylint: disable=W0622
CONFIG = '''[server]
repository = %s
plugins = %s
+# Uncomment the following to listen on all interfaces
+#listen_all = true
[statistics]
sendmailpath = %s
@@ -78,7 +80,7 @@ CLIENTS = '''<Clients version="3.0">
'''
# Mapping of operating system names to groups
-OS_LIST = [('Red Hat/Fedora/RHEL/RHAS/Centos', 'redhat'),
+OS_LIST = [('Red Hat/Fedora/RHEL/RHAS/CentOS', 'redhat'),
('SUSE/SLES', 'suse'),
('Mandrake', 'mandrake'),
('Debian', 'debian'),
@@ -234,8 +236,9 @@ class Init(Bcfg2.Server.Admin.Mode):
def _prompt_server(self):
"""Ask for the server name."""
- newserver = safe_input("Input the server location [%s]: " %
- self.data['server_uri'])
+ newserver = safe_input(
+ "Input the server location (the server listens on a single "
+ "interface by default) [%s]: " % self.data['server_uri'])
if newserver != '':
self.data['server_uri'] = newserver