summaryrefslogtreecommitdiffstats
path: root/src/sbin
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-04-08 01:19:11 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-04-08 01:19:11 +0000
commitde10f2e64cb7faf0ba0222a22035b81ca07e7426 (patch)
tree4730e5702aed17855a41dcf5a2e14f09247ecf93 /src/sbin
parent61d5b7caec10262206968e2dcbaf242806b5021e (diff)
downloadbcfg2-de10f2e64cb7faf0ba0222a22035b81ca07e7426.tar.gz
bcfg2-de10f2e64cb7faf0ba0222a22035b81ca07e7426.tar.bz2
bcfg2-de10f2e64cb7faf0ba0222a22035b81ca07e7426.zip
Implement ssl certificate split, in preparation for SSL client cert auth
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5155 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin')
-rwxr-xr-xsrc/sbin/bcfg2-server2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index 3a1a1aa91..bf850d8e5 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -63,6 +63,7 @@ class Bcfg2Serv(Bcfg2.Component.Component):
continue
try:
Bcfg2.Component.Component.__init__(self, setup['key'],
+ setup['cert'],
setup['password'],
setup['location'])
except Bcfg2.Component.ComponentInitError:
@@ -211,6 +212,7 @@ if __name__ == '__main__':
'filemonitor': Bcfg2.Options.SERVER_FILEMONITOR,
})
OPTINFO.update({'key' : Bcfg2.Options.SERVER_KEY,
+ 'cert' : Bcfg2.Options.SERVER_CERT,
'location' : Bcfg2.Options.SERVER_LOCATION,
'passwd' : Bcfg2.Options.SERVER_PASSWORD,
'static' : Bcfg2.Options.SERVER_STATIC,