From 36069e3e06f60e6cfe9f2131b236799343e5e3d0 Mon Sep 17 00:00:00 2001
From: Dimitri Huisman <diman@huisman.xyz>
Date: Tue, 28 Mar 2023 20:01:43 +0000
Subject: [PATCH 1/2] Fix access to radicale

---
 core/nginx/conf/proxy.conf               | 3 +++
 optional/radicale/radicale.conf          | 1 +
 setup/flavors/compose/docker-compose.yml | 1 +
 3 files changed, 5 insertions(+)

diff --git a/core/nginx/conf/proxy.conf b/core/nginx/conf/proxy.conf
index 840a2fdb..e01a465b 100644
--- a/core/nginx/conf/proxy.conf
+++ b/core/nginx/conf/proxy.conf
@@ -27,3 +27,6 @@ proxy_hide_header X-HTTP-Method;
 proxy_hide_header X-HTTP-Method-Override;
 proxy_hide_header X-Method;
 proxy_hide_header X-Method-Override;
+
+proxy_hide_header X-Remote-User;
+proxy_hide_header X-Script-Name;
diff --git a/optional/radicale/radicale.conf b/optional/radicale/radicale.conf
index fb1304d1..7914e6ea 100644
--- a/optional/radicale/radicale.conf
+++ b/optional/radicale/radicale.conf
@@ -18,5 +18,6 @@ type = multifilesystem
 filesystem_folder = /data
 
 [logging]
+level = info
 
 [headers]
diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index 8e0b990b..41866868 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -39,6 +39,7 @@ services:
     networks:
       - default
       - webmail
+      - radicale
     volumes:
       - "{{ root }}/certs:/certs"
       - "{{ root }}/overrides/nginx:/overrides:ro"

From 03d05c7927b1b02356de9187106b46b0ae95482b Mon Sep 17 00:00:00 2001
From: Dimitri Huisman <diman@huisman.xyz>
Date: Tue, 28 Mar 2023 20:22:28 +0000
Subject: [PATCH 2/2] Remove not needed mailu.env file.

---
 setup/flavors/compose/docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index 41866868..7d39b929 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -170,7 +170,6 @@ services:
   webdav:
     image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-{{ version }}}
     restart: always
-    env_file: {{ env }}
     volumes:
       - "{{ root }}/dav:/data"
     networks: