tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #90 from cristen/master

Browse Source 
Refs #87 Add ssl options
This commit is contained in:
Guillaume Ayoub 2013-12-13 06:22:16 -08:00
commit 8969dae12f
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config
View File

@ -26,6 +26,10 @@ ssl = False
certificate = /etc/apache2/ssl/server.crt certificate = /etc/apache2/ssl/server.crt
# SSL private key # SSL private key
key = /etc/apache2/ssl/server.key key = /etc/apache2/ssl/server.key
# SSL Protocol used. See python's ssl module for available values
protocol = PROTOCOL_SSLv23
# Ciphers available. See python's ssl module for available ciphers
ciphers =
# Reverse DNS to resolve client address in logs # Reverse DNS to resolve client address in logs
dns_lookup = True dns_lookup = True
# Root URL of Radicale (starting and ending with a slash) # Root URL of Radicale (starting and ending with a slash)

4
radicale/__init__.py
View File

@ -98,7 +98,9 @@ class HTTPSServer(HTTPServer):
server_side=True, server_side=True,
certfile=config.get("server", "certificate"), certfile=config.get("server", "certificate"),
keyfile=config.get("server", "key"), keyfile=config.get("server", "key"),
ssl_version=ssl.PROTOCOL_SSLv23) ssl_version=getattr(ssl, config.get("server", "protocol"),
ssl.PROTOCOL_SSLv23),
ciphers=config.get("server", "ciphers") or None)
self.server_bind() self.server_bind()
self.server_activate() self.server_activate()

2
radicale/config.py
View File

@ -45,6 +45,8 @@ INITIAL_CONFIG = {
"ssl": "False", "ssl": "False",
"certificate": "/etc/apache2/ssl/server.crt", "certificate": "/etc/apache2/ssl/server.crt",
"key": "/etc/apache2/ssl/server.key", "key": "/etc/apache2/ssl/server.key",
"protocol": "PROTOCOL_SSLv23",
"ciphers": "",
"dns_lookup": "True", "dns_lookup": "True",
"base_prefix": "/", "base_prefix": "/",
"realm": "Radicale - Password Required"}, "realm": "Radicale - Password Required"},