Merge branch 'master' of git://gitorious.org/~clebail/radicale/ares-radicale

Conflicts: radicale/xmlutils.py
2011-02-17 10:42:02 +01:00
parent 1f1d051656 35e277252b
commit bb7f36fc59
6 changed files with 57 additions and 38 deletions
--- a/radicale/config.py
+++ b/radicale/config.py
@@ -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()