From ca974668ba340af041471df42bb246116d1b2a0c Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Wed, 24 Jun 2009 16:26:05 +0000 Subject: SSL: Implement protocol selection in bcfg2.conf Add explicit knob to select encryption for client/server connections. The default value is xmlrpc/ssl, but xmlrpc/tlsv1 is also supported (needed to use DOE grid certs) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5297 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Component.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/lib/Component.py') diff --git a/src/lib/Component.py b/src/lib/Component.py index b3f8a0941..619fab3c5 100644 --- a/src/lib/Component.py +++ b/src/lib/Component.py @@ -25,7 +25,7 @@ class NoExposedMethod (Exception): def run_component (component_cls, location, daemon, pidfile_name, argv=None, register=True, state_name=False, cls_kwargs={}, - extra_getopt='', time_out=10, + extra_getopt='', time_out=10, protocol='xmlrpc/ssl', certfile=None, keyfile=None, ca=None): # default settings @@ -63,7 +63,8 @@ def run_component (component_cls, location, daemon, pidfile_name, argv=None, port = (port[0], int(port[1])) try: server = XMLRPCServer(port, keyfile=keyfile, certfile=certfile, - register=register, timeout=time_out, ca=ca) + register=register, timeout=time_out, ca=ca, + protocol=protocol) except: logger.error("Server startup failed") os._exit(1) -- cgit v1.2.3-1-g7c22