From 1450bd76eec59d409bdf93e5e9982ca3ec852f2b Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 19 Jul 2013 17:23:41 -0500 Subject: Admin/Init: Add listen_all option Some of these changes were suggested in github issue #29. Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Server/Admin/Init.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/lib/Bcfg2/Server/Admin/Init.py') 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 = ''' ''' # 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 -- cgit v1.2.3-1-g7c22 From 2f45bf09380595da88ebb1757042b7e799d41f57 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 19 Jul 2013 17:50:07 -0500 Subject: Admin/Init: Fix default db location Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Server/Admin/Init.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/Server/Admin/Init.py') diff --git a/src/lib/Bcfg2/Server/Admin/Init.py b/src/lib/Bcfg2/Server/Admin/Init.py index c76e54569..153d7bea6 100644 --- a/src/lib/Bcfg2/Server/Admin/Init.py +++ b/src/lib/Bcfg2/Server/Admin/Init.py @@ -33,7 +33,7 @@ sendmailpath = %s # 'postgresql', 'mysql', 'mysql_old', 'sqlite3' or 'ado_mssql'. #name = # Or path to database file if using sqlite3. -#/bcfg2.sqlite is default path if left empty +#/etc/bcfg2.sqlite is default path if left empty #user = # Not used with sqlite3. #password = -- cgit v1.2.3-1-g7c22