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:
commit
284063a270
12
config
12
config
@ -27,7 +27,7 @@ stock = utf-8
|
|||||||
|
|
||||||
[acl]
|
[acl]
|
||||||
# Access method
|
# Access method
|
||||||
# Value: fake | htpasswd
|
# Value: fake | htpasswd | authLdap
|
||||||
type = fake
|
type = fake
|
||||||
# Personal calendars only available for logged in users (if needed)
|
# Personal calendars only available for logged in users (if needed)
|
||||||
personal = False
|
personal = False
|
||||||
@ -37,6 +37,16 @@ filename = /etc/radicale/users
|
|||||||
# Value: plain | sha1 | crypt
|
# Value: plain | sha1 | crypt
|
||||||
encryption = 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]
|
[storage]
|
||||||
# Folder for storing local calendars,
|
# Folder for storing local calendars,
|
||||||
# created if not present
|
# created if not present
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import sys, ldap
|
import sys, ldap, syslog
|
||||||
|
|
||||||
from radicale import config, log
|
from radicale import config, log
|
||||||
|
|
||||||
|
@ -59,7 +59,15 @@ INITIAL_CONFIG = {
|
|||||||
"folder": os.path.expanduser("~/.config/radicale/calendars")},
|
"folder": os.path.expanduser("~/.config/radicale/calendars")},
|
||||||
"logging": {
|
"logging": {
|
||||||
"logfile": os.path.expanduser("~/.config/radicale/radicale.log"),
|
"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
|
# Create a ConfigParser and configure it
|
||||||
_CONFIG_PARSER = ConfigParser()
|
_CONFIG_PARSER = ConfigParser()
|
||||||
|
@ -20,3 +20,4 @@ class log:
|
|||||||
_LOGGING = log()
|
_LOGGING = log()
|
||||||
|
|
||||||
sys.modules[__name__] = _LOGGING
|
sys.modules[__name__] = _LOGGING
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user