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/sbin | |
| 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/sbin')
| -rwxr-xr-x | src/sbin/bcfg2-server | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index 1c9eab9ef..22137490d 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -38,6 +38,7 @@ if __name__ == '__main__': 'static' : Bcfg2.Options.SERVER_STATIC, 'encoding' : Bcfg2.Options.ENCODING, 'filelog' : Bcfg2.Options.LOGGING_FILE_PATH, + 'protocol' : Bcfg2.Options.SERVER_PROTOCOL, }) @@ -49,6 +50,7 @@ if __name__ == '__main__': location=setup['location'], daemon = setup['daemon'], pidfile_name = setup['daemon'], + protocol = setup['protocol'], register=False, cls_kwargs={'repo':setup['repo'], 'plugins':setup['plugins'], |