From 8ecabaeb47b2525a7e15504bcc3d9af98210c965 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Sun, 15 Aug 2010 01:06:11 +0000 Subject: bcfg2: Add back the new SSL key options (Fixes Ticket #916) The man page no longer contains the -K option mentioned in Ticket #908. This has been removed since [6013]. We still need the key option available in the client to prevent Ticket #916. Signed-off-by: Sol Jerome git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@6021 ce84e21b-d406-0410-9b95-82705330c041 --- src/sbin/bcfg2 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2 index 1c66c05b8..073efc302 100755 --- a/src/sbin/bcfg2 +++ b/src/sbin/bcfg2 @@ -69,9 +69,10 @@ class Client: 'filelog': Bcfg2.Options.LOGGING_FILE_PATH, 'decision': Bcfg2.Options.CLIENT_DLIST, 'servicemode': Bcfg2.Options.CLIENT_SERVICE_MODE, - 'certificate' : Bcfg2.Options.CLIENT_CERT, - 'ca' : Bcfg2.Options.CLIENT_CA, - 'serverCN' : Bcfg2.Options.CLIENT_SCNS, + 'key': Bcfg2.Options.CLIENT_KEY, + 'certificate': Bcfg2.Options.CLIENT_CERT, + 'ca': Bcfg2.Options.CLIENT_CA, + 'serverCN': Bcfg2.Options.CLIENT_SCNS, } self.setup = Bcfg2.Options.OptionParser(optinfo) -- cgit v1.2.3-1-g7c22