From 765b56d48ab18b1db0873ea05832f7ec0915b1a5 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Thu, 25 Sep 2025 13:58:05 +0200
Subject: [PATCH] Do not install radicale-storage-by-index radicale plugin
 anymore

---
 modoboa_installer/scripts/base.py             | 19 ++++++++++---------
 .../scripts/files/radicale/config.tpl         |  6 ++----
 modoboa_installer/scripts/radicale.py         |  4 ----
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/modoboa_installer/scripts/base.py b/modoboa_installer/scripts/base.py
index a9a8290..3b30e4a 100644
--- a/modoboa_installer/scripts/base.py
+++ b/modoboa_installer/scripts/base.py
@@ -2,6 +2,7 @@
 
 import os
 import sys
+from typing import Optional
 
 from .. import database
 from .. import package
@@ -13,15 +14,15 @@ from .. import utils
 class Installer:
     """Simple installer for one application."""
 
-    appname = None
-    no_daemon = False
-    daemon_name = None
-    packages = {}
-    with_user = False
-    with_db = False
-    config_files = []
+    appname: str
+    no_daemon: bool = False
+    daemon_name: Optional[str] = None
+    packages: dict[str, list[str]] = {}
+    with_user: bool = False
+    with_db: bool = False
+    config_files: list[str] = []
 
-    def __init__(self, config, upgrade: bool, archive_path: str):
+    def __init__(self, config, upgrade: bool, archive_path: str) -> None:
         """Get configuration."""
         self.config = config
         self.upgrade = upgrade
@@ -44,7 +45,7 @@ class Installer:
         self.dbpasswd = self.config.get(self.appname, "dbpassword")
 
     @property
-    def modoboa_2_2_or_greater(self):
+    def modoboa_2_2_or_greater(self) -> bool:
         # Check if modoboa version > 2.2
         modoboa_version = python.get_package_version(
             "modoboa",
diff --git a/modoboa_installer/scripts/files/radicale/config.tpl b/modoboa_installer/scripts/files/radicale/config.tpl
index e08e0f9..6da370e 100644
--- a/modoboa_installer/scripts/files/radicale/config.tpl
+++ b/modoboa_installer/scripts/files/radicale/config.tpl
@@ -92,7 +92,7 @@ oauth2_introspection_endpoint = %{oauth2_introspection_url}
 
 # Rights backend
 # Value: none | authenticated | owner_only | owner_write | from_file
-type = from_file 
+type = from_file
 
 # File for rights management from_file
 file = %{config_dir}/rights
@@ -102,8 +102,6 @@ file = %{config_dir}/rights
 
 # Storage backend
 # Value: multifilesystem
-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
@@ -134,7 +132,7 @@ filesystem_folder = %{home_dir}/collections
 
 # Web interface backend
 # Value: none | internal
-type = none 
+type = none
 
 
 [logging]
diff --git a/modoboa_installer/scripts/radicale.py b/modoboa_installer/scripts/radicale.py
index 89d27c5..fd45069 100644
--- a/modoboa_installer/scripts/radicale.py
+++ b/modoboa_installer/scripts/radicale.py
@@ -36,10 +36,6 @@ class Radicale(base.Installer):
             "Radicale", "pytz", "radicale-modoboa-auth-oauth2"
         ]
         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)
 
     def get_template_context(self):
         """Additional variables."""