tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge...

Browse Source
This commit is contained in:
Corentin Le Bail 2011-04-10 19:21:44 +02:00
parent 938aa85aed
commit 643c074dcb
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config
View File

@ -28,13 +28,8 @@ stock = utf-8
[acl] [acl]
# Access method # Access method
<<<<<<< HEAD
# Value: fake | htpasswd | authLdap
type = fake
=======
# Value: None | htpasswd # Value: None | htpasswd
type = None type = None
>>>>>>> d9ea784e31687b03f1451bc5b543122f05c5deb1
# Personal calendars only available for logged in users (if needed) # Personal calendars only available for logged in users (if needed)
personal = False personal = False
# Htpasswd filename (if needed) # Htpasswd filename (if needed)
@ -58,16 +53,6 @@ LDAPAppend = ou=users,dc=exmaple,dc=dom
# created if not present # created if not present
folder = ~/.config/radicale/calendars folder = ~/.config/radicale/calendars
<<<<<<< HEAD
[Logging]
# Logging type
# Value: syslog | file | stdout
type = file
# Logging filename (if needed)
logfile = ~/.config/radicale/radicale.log
# Log facility 10: DEBUG, 20: INFO, 30 WARNING, 40 ERROR, 50 CRITICAL
facility = 50
=======
[logging] [logging]
# Logging configuration file # Logging configuration file
# If no config is given, simple information is printed on the standard output # If no config is given, simple information is printed on the standard output
@ -76,6 +61,5 @@ facility = 50
config = /etc/radicale/logging config = /etc/radicale/logging
# Set the default logging level to debug # Set the default logging level to debug
debug = False debug = False
>>>>>>> d9ea784e31687b03f1451bc5b543122f05c5deb1
# vim:ft=cfg # vim:ft=cfg