diff options
author | Jack Neely <jjneely@ncsu.edu> | 2011-06-22 13:37:58 -0400 |
---|---|---|
committer | Jack Neely <jjneely@ncsu.edu> | 2011-06-22 13:37:58 -0400 |
commit | b848b5303c21c2dcb3d3c52e260944676864e332 (patch) | |
tree | d1969c51a20a227b42ffb4c077ba1df79d784240 /man | |
parent | 9d0c43a54e4172061af2779336b821bb93fefc71 (diff) | |
parent | 1186eae0c62ba6810ea597083bd8e56d487811c0 (diff) | |
download | bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.tar.gz bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.tar.bz2 bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.zip |
Merge branch 'master' into yumng
Conflicts:
src/lib/Client/Tools/YUMng.py
Diffstat (limited to 'man')
-rw-r--r-- | man/bcfg2.1 | 20 | ||||
-rw-r--r-- | man/bcfg2.conf.5 | 5 |
2 files changed, 23 insertions, 2 deletions
diff --git a/man/bcfg2.1 b/man/bcfg2.1 index 49fd1e208..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. @@ -118,7 +122,7 @@ should only be used in safe conditions. .TP .BR "\-Q" Run bcfg2 in "bundle quick" mode, where only entries in a bundle are -or installed. This runs much faster than -q, but doesn't provide +verified or installed. This runs much faster than -q, but doesn't provide statistics to the server at all. In order for this option to work, the -b option must also be provided. This option is incompatible with -r. @@ -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. |