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

Do not include radicale job if not needed.

Browse Source 
see #24
This commit is contained in:
Antoine Nguyen
2016-03-08 10:28:36 +01:00
parent 9f9750082b
commit 723e3a05c9
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modoboa_installer/scripts/files/modoboa/crontab.tpl
View File

@@ -23,4 +23,4 @@ INSTANCE=%{instance_path}
*/5 * * * * root $PYTHON $INSTANCE/manage.py logparser &> /dev/null */5 * * * * root $PYTHON $INSTANCE/manage.py logparser &> /dev/null
# Radicale rights file # Radicale rights file
*/2 * * * * root $PYTHON $INSTANCE/manage.py generate_rights %{radicale_enabled}*/2 * * * * root $PYTHON $INSTANCE/manage.py generate_rights

5
modoboa_installer/scripts/modoboa.py
View File

@@ -89,9 +89,12 @@ class Modoboa(base.Installer):
def get_template_context(self): def get_template_context(self):
"""Additional variables.""" """Additional variables."""
context = super(Modoboa, self).get_template_context() context = super(Modoboa, self).get_template_context()
extensions = self.config.get("modoboa", "extensions")
extensions = extensions.split()
context.update({ context.update({
"dovecot_mailboxes_owner": ( "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 return context