evgeny/modoboa-installer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed radicale setup.

Browse Source
This commit is contained in:
Antoine Nguyen
2020-09-17 21:19:54 +02:00
parent e5805fda84
commit 1960e29c97
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modoboa_installer/scripts/files/radicale/config.tpl
View File

@@ -102,8 +102,8 @@ file = %{config_dir}/rights
# Storage backend # Storage backend
# Value: multifilesystem # Value: multifilesystem
# type = radicale_storage_by_index type = radicale_storage_by_index
# radicale_storage_by_index_fields = dtstart, dtend, uid, summary radicale_storage_by_index_fields = dtstart, dtend, uid, summary
# Folder for storing local collections, created if not present # Folder for storing local collections, created if not present
filesystem_folder = %{home_dir}/collections filesystem_folder = %{home_dir}/collections
@@ -145,9 +145,6 @@ type = none
# http://docs.python.org/library/logging.config.html # http://docs.python.org/library/logging.config.html
#config = /etc/radicale/logging #config = /etc/radicale/logging
# Set the default logging level to debug
debug = False
# Store all environment variables (including those set in the shell) # Store all environment variables (including those set in the shell)
#full_environment = False #full_environment = False

4
modoboa_installer/scripts/modoboa.py
View File

@@ -100,10 +100,6 @@ class Modoboa(base.Installer):
if sys.version_info.major == 2 and sys.version_info.micro < 9: if sys.version_info.major == 2 and sys.version_info.micro < 9:
# Add extra packages to fix the SNI issue # Add extra packages to fix the SNI issue
packages += ["pyOpenSSL"] packages += ["pyOpenSSL"]
if "modoboa-radicale" in self.extensions:
# Temp. fix
packages += [
"https://github.com/modoboa/caldav/tarball/master#egg=caldav"]
python.install_packages( python.install_packages(
packages, self.venv_path, upgrade=self.upgrade, packages, self.venv_path, upgrade=self.upgrade,
sudo_user=self.user sudo_user=self.user

12
modoboa_installer/scripts/radicale.py
View File

@@ -31,12 +31,14 @@ class Radicale(base.Installer):
"""Prepare a dedicated virtualenv.""" """Prepare a dedicated virtualenv."""
python.setup_virtualenv( python.setup_virtualenv(
self.venv_path, sudo_user=self.user, python_version=3) 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_packages(packages, self.venv_path, sudo_user=self.user)
# python.install_package_from_repository( python.install_package_from_repository(
# "radicale-storage-by-index", "radicale-storage-by-index",
# "https://github.com/tonioo/RadicaleStorageByIndex", "https://github.com/tonioo/RadicaleStorageByIndex",
# venv=self.venv_path, sudo_user=self.user) venv=self.venv_path, sudo_user=self.user)
def get_template_context(self): def get_template_context(self):
"""Additional variables.""" """Additional variables."""