summaryrefslogtreecommitdiff
blob: aa867bca27cd5e7cfb6c18790fa6eae73d25891b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
From 6887e996ad771d22659c0eb8cbca94c936fdb10a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <gentoo@necoro.eu>
Date: Sun, 15 Sep 2013 14:02:32 +0200
Subject: Fix the config for Gentoo's default needs.

    * Set pathes
    * Set rights.type to 'owner_only' to model pre-0.8 behavior
      (None means 'everyone is allowed everything')
    * Remove 'public_users' and 'private_users' as they are obsolete.
---
 config  | 13 ++++---------
 logging |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/config b/config
index 453a45e..10c1595 100644
--- a/config
+++ b/config
@@ -30,7 +30,7 @@ dns_lookup = True
 # Root URL of Radicale (starting and ending with a slash)
 base_prefix = /
 # Message displayed in the client when a password is needed
-realm = Radicale - Password Required lol
+realm = Radicale - Password Required
 
 
 [encoding]
@@ -45,11 +45,6 @@ stock = utf-8
 # Value: None | htpasswd | IMAP | LDAP | PAM | courier | http
 type = None
 
-# Usernames used for public collections, separated by a comma
-public_users = public
-# Usernames used for private collections, separated by a comma
-private_users = private
-
 # Htpasswd filename
 htpasswd_filename = /etc/radicale/users
 # Htpasswd encryption method
@@ -97,10 +92,10 @@ http_password_parameter =
 [rights]
 # Rights management method
 # Value: None | owner_only | owner_write | from_file
-type = None
+type = owner_only
 
 # File for rights management from_file
-file = ~/.config/radicale/rights
+file = /etc/radicale/rights
 
 
 [storage]
@@ -109,7 +104,7 @@ file = ~/.config/radicale/rights
 type = filesystem
 
 # Folder for storing local collections, created if not present
-filesystem_folder = ~/.config/radicale/collections
+filesystem_folder = /var/lib/radicale/
 
 # Database URL for SQLAlchemy
 # dialect+driver://user:password@host/dbname[?key=value..]
diff --git a/logging b/logging
index f4efb88..b10f88c 100644
--- a/logging
+++ b/logging
@@ -45,7 +45,7 @@ formatter = simple
 [handler_file]
 # File handler
 class = FileHandler
-args = ('/var/log/radicale',)
+args = ('/var/log/radicale/radicale.log',)
 formatter = full
 
 
-- 
1.8.1.5