From 723e3a05c9d662e35fc9518428085e1a530ddce5 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 8 Mar 2016 10:28:36 +0100 Subject: [PATCH] Do not include radicale job if not needed. see #24 --- modoboa_installer/scripts/files/modoboa/crontab.tpl | 2 +- modoboa_installer/scripts/modoboa.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modoboa_installer/scripts/files/modoboa/crontab.tpl b/modoboa_installer/scripts/files/modoboa/crontab.tpl index 071665c..1dafbfd 100644 --- a/modoboa_installer/scripts/files/modoboa/crontab.tpl +++ b/modoboa_installer/scripts/files/modoboa/crontab.tpl @@ -23,4 +23,4 @@ INSTANCE=%{instance_path} */5 * * * * root $PYTHON $INSTANCE/manage.py logparser &> /dev/null # Radicale rights file -*/2 * * * * root $PYTHON $INSTANCE/manage.py generate_rights +%{radicale_enabled}*/2 * * * * root $PYTHON $INSTANCE/manage.py generate_rights diff --git a/modoboa_installer/scripts/modoboa.py b/modoboa_installer/scripts/modoboa.py index e842add..89c5b12 100644 --- a/modoboa_installer/scripts/modoboa.py +++ b/modoboa_installer/scripts/modoboa.py @@ -89,9 +89,12 @@ class Modoboa(base.Installer): def get_template_context(self): """Additional variables.""" context = super(Modoboa, self).get_template_context() + extensions = self.config.get("modoboa", "extensions") + extensions = extensions.split() context.update({ "dovecot_mailboxes_owner": ( - self.config.get("dovecot", "mailboxes_owner")) + self.config.get("dovecot", "mailboxes_owner")), + "radicale_enabled": "#" if "modoboa-radicale" in extensions else "" }) return context