diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2009-06-24 16:26:05 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2009-06-24 16:26:05 +0000 |
| commit | ca974668ba340af041471df42bb246116d1b2a0c (patch) | |
| tree | 761690160ca13d43ba9cc3d3a95a657dfe8606f8 /src/lib/Component.py | |
| parent | aa46792562f616d669329f44ec1814e6cbd6010d (diff) | |
| download | bcfg2-ca974668ba340af041471df42bb246116d1b2a0c.tar.gz bcfg2-ca974668ba340af041471df42bb246116d1b2a0c.tar.bz2 bcfg2-ca974668ba340af041471df42bb246116d1b2a0c.zip | |
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
Diffstat (limited to 'src/lib/Component.py')
| -rw-r--r-- | src/lib/Component.py | 5 |
1 files changed, 3 insertions, 2 deletions
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) |