From 1960e29c9793f58990d209ed5074ac499166e8b9 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Thu, 17 Sep 2020 21:19:54 +0200
Subject: [PATCH] Fixed radicale setup.

---
 modoboa_installer/scripts/files/radicale/config.tpl |  7 ++-----
 modoboa_installer/scripts/modoboa.py                |  4 ----
 modoboa_installer/scripts/radicale.py               | 12 +++++++-----
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/modoboa_installer/scripts/files/radicale/config.tpl b/modoboa_installer/scripts/files/radicale/config.tpl
index 8d07e20..f3c8a85 100644
--- a/modoboa_installer/scripts/files/radicale/config.tpl
+++ b/modoboa_installer/scripts/files/radicale/config.tpl
@@ -102,8 +102,8 @@ file = %{config_dir}/rights
 
 # Storage backend
 # Value: multifilesystem
-# type = radicale_storage_by_index
-# radicale_storage_by_index_fields = dtstart, dtend, uid, summary
+type = radicale_storage_by_index
+radicale_storage_by_index_fields = dtstart, dtend, uid, summary
 
 # Folder for storing local collections, created if not present
 filesystem_folder = %{home_dir}/collections
@@ -145,9 +145,6 @@ type = none
 # http://docs.python.org/library/logging.config.html
 #config = /etc/radicale/logging
 
-# Set the default logging level to debug
-debug = False 
-
 # Store all environment variables (including those set in the shell)
 #full_environment = False
 
diff --git a/modoboa_installer/scripts/modoboa.py b/modoboa_installer/scripts/modoboa.py
index 2acc07d..a1e6cb0 100644
--- a/modoboa_installer/scripts/modoboa.py
+++ b/modoboa_installer/scripts/modoboa.py
@@ -100,10 +100,6 @@ class Modoboa(base.Installer):
         if sys.version_info.major == 2 and sys.version_info.micro < 9:
             # Add extra packages to fix the SNI issue
             packages += ["pyOpenSSL"]
-        if "modoboa-radicale" in self.extensions:
-            # Temp. fix
-            packages += [
-                "https://github.com/modoboa/caldav/tarball/master#egg=caldav"]
         python.install_packages(
             packages, self.venv_path, upgrade=self.upgrade,
             sudo_user=self.user
diff --git a/modoboa_installer/scripts/radicale.py b/modoboa_installer/scripts/radicale.py
index 333387d..3029681 100644
--- a/modoboa_installer/scripts/radicale.py
+++ b/modoboa_installer/scripts/radicale.py
@@ -31,12 +31,14 @@ class Radicale(base.Installer):
         """Prepare a dedicated virtualenv."""
         python.setup_virtualenv(
             self.venv_path, sudo_user=self.user, python_version=3)
-        packages = ["Radicale==2.1.12", "radicale-dovecot-auth", "pytz"]
+        packages = [
+            "Radicale", "radicale-dovecot-auth", "pytz"
+        ]
         python.install_packages(packages, self.venv_path, sudo_user=self.user)
-        # python.install_package_from_repository(
-        #     "radicale-storage-by-index",
-        #     "https://github.com/tonioo/RadicaleStorageByIndex",
-        #     venv=self.venv_path, sudo_user=self.user)
+        python.install_package_from_repository(
+            "radicale-storage-by-index",
+            "https://github.com/tonioo/RadicaleStorageByIndex",
+            venv=self.venv_path, sudo_user=self.user)
 
     def get_template_context(self):
         """Additional variables."""