Do not install radicale-storage-by-index radicale plugin anymore
This commit is contained in:
@@ -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",
|
||||
|
||||
@@ -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]
|
||||
|
||||
@@ -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."""
|
||||
|
||||
Reference in New Issue
Block a user