From f124c67cb79c1952e6e2683bf36266f2f3581acb Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 24 May 2011 15:41:37 -0400 Subject: allow setting whitelist/blacklist mode in bcfg2.conf --- src/lib/Options.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src/lib/Options.py') diff --git a/src/lib/Options.py b/src/lib/Options.py index d5304e696..26d0fa349 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -307,6 +307,7 @@ CLIENT_INDEP = Option('Only configure the given bundle(s)', default=False, CLIENT_KEVLAR = Option('Run in kevlar (bulletproof) mode', default=False, cmd='-k', ) CLIENT_DLIST = Option('Run client in server decision list mode', default=False, + cf=('client', 'decision'), cmd='-l', odesc='') CLIENT_FILE = Option('Configure from a file rather than querying the server', default=False, cmd='-f', odesc='') -- cgit v1.2.3-1-g7c22 From 927f5d957d76f8743b1ae812b5f915588fcb8de6 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 1 Jun 2011 09:50:25 -0400 Subject: added -t option to set client timeout --- src/lib/Options.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/lib/Options.py') diff --git a/src/lib/Options.py b/src/lib/Options.py index 26d0fa349..e6eebb808 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -317,6 +317,9 @@ CLIENT_USER = Option('The user to provide for authentication', default='root', cmd='-u', cf=('communication', 'user'), odesc='') CLIENT_SERVICE_MODE = Option('Set client service mode', default='default', cmd='-s', odesc='') +CLIENT_TIMEOUT = Option('Set the client XML-RPC timeout', default=90, + cmd='-t', cf=('communication', 'timeout'), + odesc='') # APT client tool options CLIENT_APT_TOOLS_INSTALL_PATH = Option('Apt tools install path', -- cgit v1.2.3-1-g7c22 From 5a31e049ee342ec5874447796bc3978310306afb Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 3 Jun 2011 13:28:46 -0500 Subject: bcfg2-server: Add the ability to listen on specific interfaces (#1013) Signed-off-by: Sol Jerome --- src/lib/Options.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/lib/Options.py') diff --git a/src/lib/Options.py b/src/lib/Options.py index e6eebb808..9980566fb 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -173,6 +173,18 @@ def colon_split(c_string): return c_string.split(':') return [] +def get_bool(s): + # these values copied from ConfigParser.RawConfigParser.getboolean + # with the addition of True and False + truelist = ["1", "yes", "True", "true", "on"] + falselist = ["0", "no", "False", "false", "off"] + if s in truelist: + return True + elif s in falselist: + return False + else: + raise ValueError + # General options CFILE = Option('Specify configuration file', DEFAULT_CONFIG_LOCATION, cmd='-C', odesc='') @@ -249,6 +261,13 @@ SERVER_MCONNECT = Option('Server Metadata Connector list', cook=list_split, cf=('server', 'connectors'), default=['Probes'], ) SERVER_FILEMONITOR = Option('Server file monitor', cf=('server', 'filemonitor'), default='default', odesc='File monitoring driver') +SERVER_LISTEN_ALL = Option('Listen on all interfaces', + cf=('server', 'listen_all'), + cmd='--listen-all', + default=False, + long_arg=True, + cook=get_bool, + odesc='True|False') SERVER_LOCATION = Option('Server Location', cf=('components', 'bcfg2'), default='https://localhost:6789', cmd='-S', odesc='https://server:port') -- cgit v1.2.3-1-g7c22 From 437f61a1bf60bd884b9bcfd177e60922df596fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Wei=C3=9F?= Date: Sat, 4 Jun 2011 23:52:02 +0200 Subject: Document the "decision" option in bcfg2.conf(5) Add documentation for the "decision" option to the bcfg2.conf(5) man page. Also, note that it can be overridden using "-l none" on the bcfg2(1) command line. --- src/lib/Options.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/Options.py') diff --git a/src/lib/Options.py b/src/lib/Options.py index 9980566fb..5c0829df7 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -325,9 +325,9 @@ CLIENT_INDEP = Option('Only configure the given bundle(s)', default=False, cmd='-z') CLIENT_KEVLAR = Option('Run in kevlar (bulletproof) mode', default=False, cmd='-k', ) -CLIENT_DLIST = Option('Run client in server decision list mode', default=False, +CLIENT_DLIST = Option('Run client in server decision list mode', default='none', cf=('client', 'decision'), - cmd='-l', odesc='') + cmd='-l', odesc='') CLIENT_FILE = Option('Configure from a file rather than querying the server', default=False, cmd='-f', odesc='') CLIENT_QUICK = Option('Disable some checksum verification', default=False, -- cgit v1.2.3-1-g7c22 From 3fdaa9f7baf648ed6e4fa70e892605147cf9252e Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 6 Jun 2011 18:30:46 -0500 Subject: =?UTF-8?q?Options:=20Set=20default=20encoding=20to=20UTF-8=20(as?= =?UTF-8?q?=20per=20Holger=20Wei=C3=9F's=20suggestion)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sol Jerome --- src/lib/Options.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/lib/Options.py') diff --git a/src/lib/Options.py b/src/lib/Options.py index 5c0829df7..0d978c519 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -203,8 +203,10 @@ SENDMAIL_PATH = Option('Path to sendmail', cf=('reports', 'sendmailpath'), default='/usr/lib/sendmail') INTERACTIVE = Option('Prompt the user for each change', default=False, cmd='-I', ) -ENCODING = Option('Encoding of cfg files', default=sys.getdefaultencoding(), - cmd='-E', odesc='', +ENCODING = Option('Encoding of cfg files', + default='UTF-8', + cmd='-E', + odesc='', cf=('components', 'encoding')) PARANOID_PATH = Option('Specify path for paranoid file backups', default='/var/cache/bcfg2', cf=('paranoid', 'path'), -- cgit v1.2.3-1-g7c22 From 0957c3c73880448ca461aad90cebe7cf85717ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Wei=C3=9F?= Date: Tue, 21 Jun 2011 12:38:40 +0200 Subject: Correct the description of bcfg2(1)'s "-z" option The "-z" option is for use with Independent collections instead of Bundles. --- src/lib/Options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/Options.py') diff --git a/src/lib/Options.py b/src/lib/Options.py index 0d978c519..619b16787 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -323,7 +323,7 @@ CLIENT_BUNDLE = Option('Only configure the given bundle(s)', default=[], cmd='-b', odesc='', cook=colon_split) CLIENT_BUNDLEQUICK = Option('only verify/configure the given bundle(s)', default=False, cmd='-Q') -CLIENT_INDEP = Option('Only configure the given bundle(s)', default=False, +CLIENT_INDEP = Option('Only configure independent entries, ignore bundles', default=False, cmd='-z') CLIENT_KEVLAR = Option('Run in kevlar (bulletproof) mode', default=False, cmd='-k', ) -- cgit v1.2.3-1-g7c22