diff options
| -rw-r--r-- | src/lib/Options.py | 8 | ||||
| -rwxr-xr-x | src/sbin/bcfg2 | 7 |
2 files changed, 13 insertions, 2 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) diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2 index a7e420b52..0d9ac8093 100755 --- a/src/sbin/bcfg2 +++ b/src/sbin/bcfg2 @@ -74,6 +74,9 @@ class Client: 'filelog': Bcfg2.Options.LOGGING_FILE_PATH, 'decision': Bcfg2.Options.CLIENT_DLIST, 'servicemode': Bcfg2.Options.CLIENT_SERVICE_MODE, + 'key' : Bcfg2.Options.CLIENT_KEY, + 'certificate' : Bcfg2.Options.CLIENT_CERT, + 'ca' : Bcfg2.Options.CLIENT_CA, } self.setup = Bcfg2.Options.OptionParser(optinfo) @@ -168,7 +171,9 @@ class Client: proxy = Bcfg2.Proxy.ComponentProxy(self.setup['server'], self.setup['user'], self.setup['password'], - self.setup['fingerprint']) + key = self.setup['key'], + cert = self.setup['certificate'], + ca = self.setup['ca']) if self.setup['profile']: try: |