diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2011-06-21 08:35:51 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-06-21 08:35:51 -0500 |
| commit | 55bb1f8cb2aca78914e896fd2a4fdf59f53882e1 (patch) | |
| tree | aa8ab460e03fe5a2493eed9a7cea7bd1eed6731c /man | |
| parent | 2a0c5f2b603238220d1da2b1728657bd9098bea3 (diff) | |
| parent | 0957c3c73880448ca461aad90cebe7cf85717ddb (diff) | |
| download | bcfg2-55bb1f8cb2aca78914e896fd2a4fdf59f53882e1.tar.gz bcfg2-55bb1f8cb2aca78914e896fd2a4fdf59f53882e1.tar.bz2 bcfg2-55bb1f8cb2aca78914e896fd2a4fdf59f53882e1.zip | |
Merge branch 'fix-z-description' of https://github.com/weiss/bcfg2
Diffstat (limited to 'man')
| -rw-r--r-- | man/bcfg2.1 | 18 | ||||
| -rw-r--r-- | man/bcfg2.conf.5 | 5 |
2 files changed, 22 insertions, 1 deletions
diff --git a/man/bcfg2.1 b/man/bcfg2.1 index d3807e630..0ace97e8a 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 @@ -62,6 +62,10 @@ Run bcfg2 against one or multiple bundles in the configuration. Cache a copy of the configuration in cachefile. .TP +.BR "\-\-ca\-cert=<ca cert>" +Specifiy the path to the SSL CA certificate. + +.TP .BR "\-d" Run bcfg2 in debug mode. @@ -137,6 +141,14 @@ to stop all services started. disabled suppresses all attempts to modify services. .TP +.BR "\-\-ssl\-cert=<ssl cert>" +Specifiy the path to the SSL certificate. + +.TP +.BR "\-\-ssl\-cns=<CommonName1:CommonName2 ...>" +List of acceptable SSL server Common Names. + +.TP .BR "\-\-ssl\-key=<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 independent entries, ignore bundles. .RE .SH "SEE ALSO" .BR bcfg2-server(8), 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 @@ -379,6 +379,11 @@ Communication protocol to use. Defaults to xmlrpc/ssl. 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. |