Merge branch 'master' of git://gitorious.org/radicale/radicale

Conflicts:
	radicale/__init__.py
This commit is contained in:
System User
2011-04-07 16:30:46 +02:00
7 changed files with 85 additions and 49 deletions

9
config
View File

@ -6,10 +6,11 @@
# The current values are the default ones
[server]
# CalDAV server hostname, empty for all hostnames
host =
# CalDAV server port
port = 5232
# CalDAV server hostnames separated by a comma
# IPv4 syntax: address:port
# IPv6 syntax: [address]:port
# IPv6 adresses are configured to only allow IPv6 connections
hosts = 0.0.0.0:5232
# Daemon flag
daemon = False
# SSL flag, enable HTTPS protocol