oss/Radicale
oss/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-08-04 18:22:26 +00:00
Code Wiki Activity

Merge with radicale/master

Browse source
This commit is contained in:
Corentin Le Bail 2011-04-10 19:17:35 +02:00
parent 96bded2bbc
commit c890d6e55a
3 changed files with 27 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

12
radicale/config.py
View file

@ -55,18 +55,12 @@ INITIAL_CONFIG = {
"storage": {
"folder": os.path.expanduser("~/.config/radicale/calendars")},
"logging": {
<<<<<<< HEAD
"type": "stdout",
"logfile": os.path.expanduser("~/.config/radicale/radicale.log"),
"facility": 10},
"config": "/etc/radicale/logging",
"debug": "False"},
"authLdap": {
"LDAPServer": "127.0.0.1",
"LDAPPrepend": "uid=",
"LDAPAppend": "ou=users,dc=example,dc=com"}}
=======
"config": "/etc/radicale/logging",
"debug": "False"}}
>>>>>>> d9ea784e31687b03f1451bc5b543122f05c5deb1
# Create a ConfigParser and configure it
_CONFIG_PARSER = ConfigParser()
@ -77,7 +71,7 @@ for section, values in INITIAL_CONFIG.items():
_CONFIG_PARSER.set(section, key, value)
_CONFIG_PARSER.read("/etc/radicale/config")
_CONFIG_PARSER.read(os.path.expdanuser("~/.config/radicale/config"))
_CONFIG_PARSER.read(os.path.expanduser("~/.config/radicale/config"))
# Wrap config module into ConfigParser instance
sys.modules[__name__] = _CONFIG_PARSER