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

12
config
View File

@ -27,7 +27,7 @@ stock = utf-8
[acl]
# Access method
# Value: fake | htpasswd
# Value: fake | htpasswd | authLdap
type = fake
# Personal calendars only available for logged in users (if needed)
personal = False
@ -37,6 +37,16 @@ filename = /etc/radicale/users
# Value: plain | sha1 | crypt
encryption = crypt
[authLdap]
#LDAP Host
LDAPServer = 127.0.0.1
#Fields to create a LDAP bind
#Value to add before the user name in a LDAP bind
LDAPPrepend = uid=
#Value to add after the user name in a LDAP bind
LDAPAppend = ou=users,dc=exmaple,dc=dom
#=> uid=corentin,ou=users,dc=exmaple,dc=dom
[storage]
# Folder for storing local calendars,
# created if not present

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
import sys, ldap
import sys, ldap, syslog
from radicale import config, log

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()

View File

@ -20,3 +20,4 @@ class log:
_LOGGING = log()
sys.modules[__name__] = _LOGGING