From d4d353f0b6561e6a95b1c910fb7dca1721aac84b Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Fri, 23 Jul 2021 12:58:53 +0200
Subject: [PATCH] move radicale to rx300

---
 bundles/radicale/files/config                  |  4 +---
 data/powerdns/files/bind-zones/franzi.business |  3 ++-
 nodes/htz/ex42-1048908.py                      | 13 +------------
 nodes/rx300.py                                 |  8 ++++++++
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/bundles/radicale/files/config b/bundles/radicale/files/config
index 4def69c..3ec3bca 100644
--- a/bundles/radicale/files/config
+++ b/bundles/radicale/files/config
@@ -1,6 +1,6 @@
 [server]
 hosts = [::1]:22050
-max_connections = 100
+max_connections = 0
 
 [encoding]
 request = utf-8
@@ -15,8 +15,6 @@ type = owner_only
 [storage]
 type = multifilesystem
 filesystem_folder = /var/lib/radicale/collections/
-filesystem_locking = True
-filesystem_fsync = True
 
 [web]
 type = internal
diff --git a/data/powerdns/files/bind-zones/franzi.business b/data/powerdns/files/bind-zones/franzi.business
index 6a40424..97c9e98 100644
--- a/data/powerdns/files/bind-zones/franzi.business
+++ b/data/powerdns/files/bind-zones/franzi.business
@@ -23,8 +23,9 @@ mta-sts         IN  AAAA    2a01:4f8:10b:2a5f::2
 sewfile         IN  CNAME   sewfile.htz-cloud.kunbox.net.
                 IN  TXT     "v=spf1 a mx ~all"
 
-rss             IN  CNAME   rx300.kunbox.net.
 paste           IN  CNAME   rx300.kunbox.net.
+radicale        IN  CNAME   rx300.kunbox.net.
+rss             IN  CNAME   rx300.kunbox.net.
 status          IN  CNAME   icinga2.ovh.kunbox.net.
 travelynx       IN  CNAME   rx300.kunbox.net.
 unicornsden     IN  CNAME   rx300.kunbox.net.
diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py
index 5b18bab..9ea8a2e 100644
--- a/nodes/htz/ex42-1048908.py
+++ b/nodes/htz/ex42-1048908.py
@@ -5,7 +5,6 @@ nodes['htz.ex42-1048908'] = {
         'postfixadmin',
         'redis',
         'rspamd',
-        'radicale',
 
         # no migration needed
         'check-mail-received',
@@ -106,21 +105,11 @@ nodes['htz.ex42-1048908'] = {
                 'Encryption': 'https://franzi.business/gpg_hi-kunsmann.eu.asc',
             },
             'vhosts': {
-                # TODO maybe some of this can be moved to a bundle?
                 'dav.kunsmann.eu': {
                     'locations': {
                         '/': {
-                            'target': 'http://[::1]:22050',
-                            'auth': {
-                                'file': '/etc/radicale/htpasswd',
-                            },
-                            'proxy_set_header': {
-                                'X-Remote-User': '$remote_user',
-                            },
+                            'redirect': 'https://radicale.franzi.business$request_uri',
                         },
-                        '/.web/': {
-                            'target': 'http://[::1]:22050',
-                        }
                     },
                 },
                 'dimension.franzi.business': {
diff --git a/nodes/rx300.py b/nodes/rx300.py
index 705e5a1..3e454e4 100644
--- a/nodes/rx300.py
+++ b/nodes/rx300.py
@@ -24,6 +24,7 @@ nodes['rx300'] = {
         'php',
         #'postfixadmin',
         'postgresql',
+        'radicale',
         'redis',
         # does not yet have packages for bullseye, buster version depends
         # on libicu63, which does not exist in bullseye (but libicu67)
@@ -261,6 +262,7 @@ nodes['rx300'] = {
                 'jenkins-ci': {'ssl': '_.franzi.business'},
                 'matrix-synapse': {'ssl': '_.franzi.business'},
                 'miniflux': {'ssl': '_.franzi.business'},
+                'radicale': {'ssl': '_.franzi.business'},
                 'travelynx': {'ssl': '_.franzi.business'},
                 'daskritzelt-redirect': {
                     'domain': 'die-brontosaurier-waren-es.org',
@@ -394,6 +396,12 @@ nodes['rx300'] = {
         'postgresql': {
             'version': '13',
         },
+        'radicale': {
+            'domain': 'radicale.franzi.business',
+            'users': {
+                'kunsi': bwpass.password('radicale.franzi.business/kunsi'),
+            },
+        },
         'rspamd': {
             'ignore_spam_check_for_ips': {
                 # entropia