1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-09-12 20:30:57 +00:00

Merge branch 'master' of git://gitorious.org/~clebail/radicale/ares-radicale

Conflicts:
	config
	radicale/acl/authLdap.py
	radicale/config.py
	radicale/log.py
This commit is contained in:
Corentin Le Bail 2011-02-16 14:17:28 +01:00
commit 284063a270
4 changed files with 23 additions and 4 deletions

View file

@ -59,7 +59,15 @@ INITIAL_CONFIG = {
"folder": os.path.expanduser("~/.config/radicale/calendars")},
"logging": {
"logfile": os.path.expanduser("~/.config/radicale/radicale.log"),
"facility": 10}}
"facility": 10},
"authLdap": {
"LDAPServer": "127.0.0.1",
"LDAPPrepend": "uid=",
"LDAPAppend": "ou=users,dc=example,dc=com"},
"logging": {
"logfile": os.path.expanduser("~/.config/radicale/radicale.log"),
"facility": "error"}
}
# Create a ConfigParser and configure it
_CONFIG_PARSER = ConfigParser()