From 506b7e9372ce0a972cbec6cd2333b56fd7a893f0 Mon Sep 17 00:00:00 2001
From: ofthesun9 <olivier@ofthesun.net>
Date: Thu, 28 May 2020 14:05:47 +0200
Subject: [PATCH] Use Radicale 3.x for webdav service - remove ==2.1.12 in
 Dockerfile pip3 install radicale - remove -f flag in Dockerfile CMD - remove
 deprecated daemon and dns_lookup settings from radicale.conf - move realm
 setting from [server] to [auth] in radicale.conf - add newsfragment

---
 optional/radicale/Dockerfile      | 4 ++--
 optional/radicale/radicale.conf   | 4 +---
 towncrier/newsfragments/1512.misc | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 towncrier/newsfragments/1512.misc

diff --git a/optional/radicale/Dockerfile b/optional/radicale/Dockerfile
index 64712208..bbd05d43 100644
--- a/optional/radicale/Dockerfile
+++ b/optional/radicale/Dockerfile
@@ -2,13 +2,13 @@ ARG DISTRO=alpine:3.10
 FROM $DISTRO
 
 RUN apk add --no-cache curl bash python3 \
- && pip3 install radicale==2.1.12
+ && pip3 install radicale
 
 COPY radicale.conf /radicale.conf
 
 EXPOSE 5232/tcp
 VOLUME ["/data"]
 
-CMD radicale -f -S -C /radicale.conf
+CMD radicale -S -C /radicale.conf
 
 HEALTHCHECK CMD curl -f -L http://localhost:5232/ || exit 1
diff --git a/optional/radicale/radicale.conf b/optional/radicale/radicale.conf
index e2ed045e..6c99d8e0 100644
--- a/optional/radicale/radicale.conf
+++ b/optional/radicale/radicale.conf
@@ -1,15 +1,13 @@
 [server]
 hosts = 0.0.0.0:5232, [::]:5232
-daemon = False
 ssl = False
-dns_lookup = False
-realm = Radicale - Password Required
 
 [encoding]
 request = utf-8
 stock = utf-8
 
 [auth]
+realm = Radicale - Password Required
 type = http_x_remote_user
 
 [rights]
diff --git a/towncrier/newsfragments/1512.misc b/towncrier/newsfragments/1512.misc
new file mode 100644
index 00000000..a886a8c0
--- /dev/null
+++ b/towncrier/newsfragments/1512.misc
@@ -0,0 +1 @@
+Use Radicale 3.x for webdav service