summaryrefslogtreecommitdiffstats
path: root/src/lib/Options.py
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-05-06 01:27:44 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-05-06 01:27:44 +0000
commit94f41c8cf61da64952a8567cc7b08b7b4b762a7f (patch)
tree6fc7a58444e2ce7c71dcfa3616ce7ea863cd11fc /src/lib/Options.py
parent2eb0c1eb999666fae548f33bb5f75aa19dd16645 (diff)
downloadbcfg2-94f41c8cf61da64952a8567cc7b08b7b4b762a7f.tar.gz
bcfg2-94f41c8cf61da64952a8567cc7b08b7b4b762a7f.tar.bz2
bcfg2-94f41c8cf61da64952a8567cc7b08b7b4b762a7f.zip
SSL: build appropriate client options
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5196 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Options.py')
-rw-r--r--src/lib/Options.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/Options.py b/src/lib/Options.py
index f9134c925..56bbd96d5 100644
--- a/src/lib/Options.py
+++ b/src/lib/Options.py
@@ -206,7 +206,13 @@ SERVER_KEY = Option('Path to SSL key', cf=('communication', 'key'),
default=False, cmd='-K', odesc='<ssl key file>')
SERVER_CERT = Option('Path to SSL certificate', default='/etc/bcfg2.key',
cf=('communication', 'certificate'), odesc='<ssl cert>')
-SERVER_CA = Option('Path to SSL CA Cert', default=False,
+SERVER_CA = Option('Path to SSL CA Cert', default=None,
+ cf=('communication', 'ca'), odesc='<ca cert>')
+CLIENT_KEY = Option('Path to SSL key', cf=('communication', 'key'),
+ default=None, odesc='<ssl key>')
+CLIENT_CERT = Option('Path to SSL certificate', default=None,
+ cf=('communication', 'certificate'), odesc='<ssl cert>')
+CLIENT_CA = Option('Path to SSL CA Cert', default=None,
cf=('communication', 'ca'), odesc='<ca cert>')
SERVER_PASSWORD = Option('Communication Password', cmd='-x', odesc='<password>',
cf=('communication', 'password'), default=False)