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

Merge branch 'master' of git://gitorious.org/radicale/radicale

Browse source 
Conflicts:
	config
	radicale/__init__.py
	radicale/config.py
	radicale/log.py
This commit is contained in:
Corentin Le Bail 2011-04-10 18:55:49 +02:00
commit 96bded2bbc
9 changed files with 157 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

7
radicale/config.py
View file

@ -48,13 +48,14 @@ INITIAL_CONFIG = {
"request": "utf-8",
"stock": "utf-8"},
"acl": {
"type": "fake",
"type": "None",
"personal": "False",
"filename": "/etc/radicale/users",
"encryption": "crypt"},
"storage": {
"folder": os.path.expanduser("~/.config/radicale/calendars")},
"logging": {
<<<<<<< HEAD
"type": "stdout",
"logfile": os.path.expanduser("~/.config/radicale/radicale.log"),
"facility": 10},
@ -62,6 +63,10 @@ INITIAL_CONFIG = {
"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()