diff options
| author | Sol Jerome <solj@ices.utexas.edu> | 2010-01-08 16:04:08 +0000 |
|---|---|---|
| committer | Sol Jerome <solj@ices.utexas.edu> | 2010-01-08 16:04:08 +0000 |
| commit | 5b1b8a05c25fd757c80c43d619a315f665c47d1d (patch) | |
| tree | abfb1dfe0c3d9d0b93129d1f7a633b9c5ee34fb0 /man/bcfg2.conf.5 | |
| parent | 6c151b83eb58d2ebba9542e3c465f94143ccf504 (diff) | |
| download | bcfg2-5b1b8a05c25fd757c80c43d619a315f665c47d1d.tar.gz bcfg2-5b1b8a05c25fd757c80c43d619a315f665c47d1d.tar.bz2 bcfg2-5b1b8a05c25fd757c80c43d619a315f665c47d1d.zip | |
man pages: Move SSL options to proper section (Reported by Martin Schwier #828)
Signed-off-by: Sol Jerome <solj@ices.utexas.edu>
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5663 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'man/bcfg2.conf.5')
| -rw-r--r-- | man/bcfg2.conf.5 | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5 index fce572d94..ca0243737 100644 --- a/man/bcfg2.conf.5 +++ b/man/bcfg2.conf.5 @@ -25,18 +25,6 @@ These options are only necessary on the Bcfg2 server. They are specified in the Specifies the path to the Bcfg2 repository containing all of the configuration specifications. The repository should be created using the bcfg2-init command. .TP -.B key -Specifies the path to a file containing the SSL Key. This is required on the server in all cases, and required on clients if using client certificates. - -.TP -.B certificate -The path to a file containing a PEM formatted certificate which signs the key with the ca certificate. This setting is required on the server in all cases, and required on clients if using client certificates. - -.TP -.B ca -The path to a file containing the CA certificate. This file is required on the server, and optional on clients. However, if the cacert is not present on clients, the server cannot be verified. - -.TP .B filemonitor The file monitor used to watch for changes in the repository. Values of 'gamin', 'fam', or 'pseudo' are valid. @@ -239,12 +227,24 @@ Port for database connections. Not used for sqlite3. Specified in the [communication] section. These options define settings used for client-server communication. .TP -.B password -Required on both the server and clients. On the server, sets the password clients need to use to communicate. On a client, sets the password to use to connect to the server. +.B agent-port +The TCP port on which to bind for agent mode. + +.TP +.B ca +The path to a file containing the CA certificate. This file is required on the server, and optional on clients. However, if the cacert is not present on clients, the server cannot be verified. + +.TP +.B certificate +The path to a file containing a PEM formatted certificate which signs the key with the ca certificate. This setting is required on the server in all cases, and required on clients if using client certificates. .TP .B key -A server-only option. The file system path to the server's SSL key. Required if using xmlrpc/ssl for communication. +Specifies the path to a file containing the SSL Key. This is required on the server in all cases, and required on clients if using client certificates. + +.TP +.B password +Required on both the server and clients. On the server, sets the password clients need to use to communicate. On a client, sets the password to use to connect to the server. .TP .B protocol @@ -255,10 +255,6 @@ Communication protocol to use. Defaults to xmlrpc/ssl. A client-only option. Number of times to retry network communication. .TP -.B agent-port -The TCP port on which to bind for agent mode. - -.TP .B user A client-only option. The UUID of the client. |