summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/SSLServer.py
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2014-10-15 17:03:41 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2014-10-15 17:05:27 +0200
commit007083a7f9af76a8e9efafddf2dd9061238a35c8 (patch)
tree4e3a8f98cc91f99c0252973594cfd7d9040612f3 /src/lib/Bcfg2/Server/SSLServer.py
parentc085a14f049082bf756209ad83f8722d4218a48b (diff)
downloadbcfg2-007083a7f9af76a8e9efafddf2dd9061238a35c8.tar.gz
bcfg2-007083a7f9af76a8e9efafddf2dd9061238a35c8.tar.bz2
bcfg2-007083a7f9af76a8e9efafddf2dd9061238a35c8.zip
Options: change default communication protocol to xmlrpc/tlsv1
Diffstat (limited to 'src/lib/Bcfg2/Server/SSLServer.py')
-rw-r--r--src/lib/Bcfg2/Server/SSLServer.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/SSLServer.py b/src/lib/Bcfg2/Server/SSLServer.py
index 5e6846a44..6ad5b5635 100644
--- a/src/lib/Bcfg2/Server/SSLServer.py
+++ b/src/lib/Bcfg2/Server/SSLServer.py
@@ -72,7 +72,7 @@ class SSLServer(SocketServer.TCPServer, object):
def __init__(self, listen_all, server_address, RequestHandlerClass,
keyfile=None, certfile=None, reqCert=False, ca=None,
- timeout=None, protocol='xmlrpc/ssl'):
+ timeout=None, protocol='xmlrpc/tlsv1'):
"""
:param listen_all: Listen on all interfaces
:type listen_all: bool
@@ -333,7 +333,7 @@ class XMLRPCServer(SocketServer.ThreadingMixIn, SSLServer,
""" Component XMLRPCServer. """
def __init__(self, listen_all, server_address, RequestHandlerClass=None,
- keyfile=None, certfile=None, ca=None, protocol='xmlrpc/ssl',
+ keyfile=None, certfile=None, ca=None, protocol='xmlrpc/tlsv1',
timeout=10, logRequests=False,
register=True, allow_none=True, encoding=None):
"""