From 5a6f8f84bcec107812a93c8d68ea7bfd12cda5e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20K=C3=A5berg?= <joel@eth0.im>
Date: Sun, 22 May 2016 03:50:55 +0200
Subject: [PATCH] cleanup

---
 conf/nginx-primaryonly.conf |  9 ++++--
 setup/radicale.sh           | 56 +++++++++++++++----------------------
 2 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/conf/nginx-primaryonly.conf b/conf/nginx-primaryonly.conf
index 1f71bdab..337355d5 100644
--- a/conf/nginx-primaryonly.conf
+++ b/conf/nginx-primaryonly.conf
@@ -12,10 +12,13 @@
 	}
 
 	location /radicale {
-		uwsgi_pass unix:///tmp/radicale.sock;
+		access_log /var/log/radicale/access.log;
+		error_log /var/log/radicale/error.log;
+		proxy_pass http://127.0.0.1:5232;
 	}
 
-	#rewrite ^/.well-known/carddav /cloud/remote.php/carddav/ redirect; <-- fix this
-	#rewrite ^/.well-known/caldav /cloud/remote.php/caldav/ redirect; <-- fix this
+	location ~ ^/.well-known/(caldav|carddav) {
+		rewrite ^ /radicale$request_uri last;
+    }
 
 	# ADDITIONAL DIRECTIVES HERE
diff --git a/setup/radicale.sh b/setup/radicale.sh
index 3b89756e..ed49da3a 100644
--- a/setup/radicale.sh
+++ b/setup/radicale.sh
@@ -22,7 +22,7 @@ fi
 apt-get purge -qq -y owncloud*
 
 # Install it
-apt_install install -y radicale uwsgi uwsgi-plugin-http uwsgi-plugin-python
+apt_install radicale uwsgi uwsgi-core
 
 # Create Directories
 mkdir -p $STORAGE_ROOT/radicale/etc/
@@ -48,37 +48,26 @@ type = from_file
 file = $STORAGE_ROOT/radicale/etc/rights
 [storage]
 filesystem_folder = $STORAGE_ROOT/radicale/collections
-[logging]
-config = $STORAGE_ROOT/radicale/etc/logging
-#debug = True
 EOF
 
-# Logging config
-cat > $STORAGE_ROOT/radicale/etc/logging <<EOF;
-# Logging
-[loggers]
-keys = root
-[handlers]
-keys = console,file
-[formatters]
-keys = simple,full
-[logger_root]
-level = DEBUG
-handlers = file
-[handler_console]
-class = StreamHandler
-level = DEBUG
-args = (sys.stdout,)
-formatter = simple
-[handler_file]
-class = FileHandler
-args = ('$STORAGE_ROOT/radicale/radicale.log',)
-level = INFO
-formatter = full
-[formatter_simple]
-format = %(message)s
-[formatter_full]
-format = %(asctime)s - %(levelname)s: %(message)s
+# Radicale rights config
+cat > $STORAGE_ROOT/radicale/etc/rights <<EOF;
+[admin]
+user: ^admin.*$
+collection: .*
+permission: r
+[public]
+user: .*
+collection: ^public(/.+)?$
+permission: rw
+[domain-wide-access]
+user: ^.+@(.+)\..+$
+collection: ^{0}/.+$
+permission: r
+[owner-write]
+user: .+
+collection: ^%(login)s/.*$
+permission: w
 EOF
 
 # WSGI launch file
@@ -92,16 +81,17 @@ application = radicale.Application()
 EOF
 
 # UWSGI config file
-cat > /etc/uwsgi/apps-available/radicale.ini <<EOF;
+cat > /etc/uwsgi/apps-available/radicale <<EOF;
 [uwsgi]
 uid = www-data
 gid = www-data
-socket = /tmp/radicale.sock
 plugins = http, python
 wsgi-file = $STORAGE_ROOT/radicale/radicale.wsgi
-pidfile = $STORAGE_ROOT/radicale/radicale.pid
 EOF
 
+# Enabled the uwsgi app
+ln -s /etc/uwsgi/apps-available/radicale /etc/uwsgi/apps-enabled/radicale
+
 # Set proper rights
 chown -R www-data:www-data $STORAGE_ROOT/radicale