diff options
| -rw-r--r-- | man/bcfg2.1 | 10 | ||||
| -rw-r--r-- | man/bcfg2.conf.5 | 4 | ||||
| -rw-r--r-- | src/lib/Options.py | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/man/bcfg2.1 b/man/bcfg2.1 index 7f108ed8f..49fd1e208 100644 --- a/man/bcfg2.1 +++ b/man/bcfg2.1 @@ -85,10 +85,12 @@ debian toolset; it calls apt\-get update and clean and dpkg \-\-configure \-\-pending. .TP -.BR "\-l <whitelist|blacklist>" -Run the client in the server decision list mode. This approach is needed -when particular changes are deemed "high risk". It gives the ability to -centrally specify these changes, but only install them on clients when +.BR "\-l <whitelist|blacklist|none>" +Run the client in the server decision list mode (unless "none" is +specified, which can be done in order to override the decision list mode +specified in bcfg2.conf). This approach is needed when particular +changes are deemed "high risk". It gives the ability to centrally +specify these changes, but only install them on clients when administrator supervision is available. Because collaborative configuration is one of the remaining hard issues in configuration management, these issues typically crop up in environments with several diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5 index b1acce7c3..44d8beb50 100644 --- a/man/bcfg2.conf.5 +++ b/man/bcfg2.conf.5 @@ -291,6 +291,10 @@ These options only affect client functionality, specified in the [client] section. .TP +.B decision +Specify the server decision list mode (whitelist or blacklist). + +.TP .B drivers Specify tool driver set to use. This option can be used to explicitly specify the client tool drivers you want to use when the client is run. 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='<whitelist|blacklist>') + cmd='-l', odesc='<whitelist|blacklist|none>') CLIENT_FILE = Option('Configure from a file rather than querying the server', default=False, cmd='-f', odesc='<specification path>') CLIENT_QUICK = Option('Disable some checksum verification', default=False, |