From 1baa342cb4e8a9c7775a5a52406d0bf2019382ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Wei=C3=9F?= Date: Mon, 20 Jun 2011 16:38:21 +0200 Subject: Add missing options to the bcfg2(1) manpage A few of the existing bcfg2(1) options were missing from the manpage. --- man/bcfg2.1 | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'man') diff --git a/man/bcfg2.1 b/man/bcfg2.1 index 49fd1e208..03368b400 100644 --- a/man/bcfg2.1 +++ b/man/bcfg2.1 @@ -3,7 +3,7 @@ bcfg2 \- reconfigure machine based on settings in Bcfg2 .SH SYNOPSIS .B bcfg2 -.I [\-d] [\-v] [\-p] [\-c cache file] [\-e] [\-f config file] [\-I] [\-q] [\-b bundle] [\-r removal mode] +.I [\-d] [\-v] [\-p] [\-c cache file] [\-e] [\-f config file] [\-I] [\-q] [\-z] [\-b bundle] [\-r removal mode] [\-\-ca\-cert=file] [\-\-ssl\-cns=list] [\-\-ssl\-cert=file] [\-\-ssl\-key=file] .SH DESCRIPTION .TP .BR bcfg2 @@ -61,6 +61,10 @@ Run bcfg2 against one or multiple bundles in the configuration. .BR "\-c " Cache a copy of the configuration in cachefile. +.TP +.BR "\-\-ca\-cert=" +Specifiy the path to the SSL CA certificate. + .TP .BR "\-d" Run bcfg2 in debug mode. @@ -136,6 +140,14 @@ modify all services affected by reconfiguration. build mode attempts to stop all services started. disabled suppresses all attempts to modify services. +.TP +.BR "\-\-ssl\-cert=" +Specifiy the path to the SSL certificate. + +.TP +.BR "\-\-ssl\-cns=" +List of acceptable SSL server Common Names. + .TP .BR "\-\-ssl\-key=" Specifiy the path to the SSL key. @@ -156,6 +168,10 @@ seconds. .TP .BR "\-v" Run bcfg2 in verbose mode. + +.TP +.BR "\-z" +Only configure the given bundle(s). .RE .SH "SEE ALSO" .BR bcfg2-server(8), -- cgit v1.2.3-1-g7c22 From 61898874c8acc06fe5b3ce07de341a20d857e997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Wei=C3=9F?= Date: Mon, 20 Jun 2011 17:02:40 +0200 Subject: Document serverCommonNames in bcfg2.conf(5) Describe the serverCommonNames option which can be specified in the [communication] section of the bcfg2.conf(5) file. --- man/bcfg2.conf.5 | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'man') diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5 index 786f69f9a..7cd04a0b7 100644 --- a/man/bcfg2.conf.5 +++ b/man/bcfg2.conf.5 @@ -378,6 +378,11 @@ Communication protocol to use. Defaults to xmlrpc/ssl. .B retries A client-only option. Number of times to retry network communication. +.TP +.B serverCommonNames +A client-only option. A colon-separated list of Common Names the client +will accept in the SSL certificate presented by the server. + .TP .B user A client-only option. The UUID of the client. -- 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. --- man/bcfg2.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'man') diff --git a/man/bcfg2.1 b/man/bcfg2.1 index 03368b400..0e947a21c 100644 --- a/man/bcfg2.1 +++ b/man/bcfg2.1 @@ -171,7 +171,7 @@ Run bcfg2 in verbose mode. .TP .BR "\-z" -Only configure the given bundle(s). +Only configure independent entries, ignore bundles. .RE .SH "SEE ALSO" .BR bcfg2-server(8), -- cgit v1.2.3-1-g7c22