mirror of
https://github.com/Kozea/Radicale.git
synced 2025-08-10 18:40:53 +00:00
Merge branch 'master' of git://gitorious.org/~clebail/radicale/ares-radicale
Conflicts: radicale/xmlutils.py
This commit is contained in:
commit
bb7f36fc59
6 changed files with 57 additions and 38 deletions
|
@ -55,14 +55,13 @@ INITIAL_CONFIG = {
|
|||
"encryption": "crypt"},
|
||||
"storage": {
|
||||
"folder": os.path.expanduser("~/.config/radicale/calendars")},
|
||||
"logging": {
|
||||
"logfile": os.path.expanduser("~/.config/radicale/radicale.log"),
|
||||
"facility": 10},
|
||||
"authLdap": {
|
||||
"LDAPServer": "127.0.0.1",
|
||||
"LDAPPrepend": "uid=",
|
||||
"LDAPAppend": "ou=users,dc=example,dc=com"},
|
||||
"logging": {
|
||||
"file": os.path.expanduser("~/.config/radicale/radicale.log"),
|
||||
"level": "error"}
|
||||
}
|
||||
"LDAPAppend": "ou=users,dc=example,dc=com"}}
|
||||
|
||||
# Create a ConfigParser and configure it
|
||||
_CONFIG_PARSER = ConfigParser()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue