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

HTTP support

Browse Source 
git-svn-id: http://svn.32rwr.info/radicale/trunk@4 74e4794c-479d-4a33-9dda-c6c359d70f12
This commit is contained in:
(no author) 2008-12-30 17:41:48 +00:00
parent f4d9f83739
commit 5e1a4d4131
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
radicale.py
View File

@ -25,7 +25,6 @@
import sys import sys
sys.path.append("/usr/local/lib/python2.5/site-packages") sys.path.append("/usr/local/lib/python2.5/site-packages")
from OpenSSL import SSL
from twisted.web import server from twisted.web import server
from twisted.internet import reactor from twisted.internet import reactor
from twisted.python import log from twisted.python import log
@ -40,6 +39,7 @@ class ServerContextFactory(object):
""" """
Get SSL context for the HTTP server Get SSL context for the HTTP server
""" """
from OpenSSL import SSL
ctx = SSL.Context(SSL.SSLv23_METHOD) ctx = SSL.Context(SSL.SSLv23_METHOD)
ctx.use_certificate_file(radicale.config.get("server", "certificate")) ctx.use_certificate_file(radicale.config.get("server", "certificate"))
ctx.use_privatekey_file(radicale.config.get("server", "privatekey")) ctx.use_privatekey_file(radicale.config.get("server", "privatekey"))
@ -48,5 +48,10 @@ class ServerContextFactory(object):
log.startLogging(sys.stdout) log.startLogging(sys.stdout)
#log.startLogging(open(radicale.config.get("server", "log"), "w")) #log.startLogging(open(radicale.config.get("server", "log"), "w"))
factory = server.Site(radicale.HttpResource()) factory = server.Site(radicale.HttpResource())
reactor.listenSSL(radicale.config.getint("server", "port"), factory, ServerContextFactory())
if radicale.config.get("server", "type") == "http":
reactor.listenTCP(radicale.config.getint("server", "port"), factory)
elif radicale.config.get("server", "type") == "https":
reactor.listenSSL(radicale.config.getint("server", "port"), factory, ServerContextFactory())
reactor.run() reactor.run()

1
radicale/config.py
View File

@ -31,6 +31,7 @@ items = _config.items
# Default config # Default config
_initial = { _initial = {
"server": { "server": {
"type": "http",
"certificate": "/etc/apache2/ssl/server.crt", "certificate": "/etc/apache2/ssl/server.crt",
"privatekey": "/etc/apache2/ssl/server.key", "privatekey": "/etc/apache2/ssl/server.key",
"log": "/var/www/radicale/server.log", "log": "/var/www/radicale/server.log",