From d1ac5543ce614e0c9842f0e466f745a4a996460f Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 15 Oct 2015 13:08:57 +0200 Subject: [PATCH] Few fixes. --- modoboa_installer/scripts/files/postfix/main.cf.tpl | 2 +- modoboa_installer/scripts/modoboa.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modoboa_installer/scripts/files/postfix/main.cf.tpl b/modoboa_installer/scripts/files/postfix/main.cf.tpl index 0bd76a3..25aeb68 100644 --- a/modoboa_installer/scripts/files/postfix/main.cf.tpl +++ b/modoboa_installer/scripts/files/postfix/main.cf.tpl @@ -53,8 +53,8 @@ virtual_alias_maps = relay_domains = %{db_driver}:/etc/postfix/sql-relaydomains.cf transport_maps = + %{db_driver}:/etc/postfix/sql-spliteddomains-transport.cf %{db_driver}:/etc/postfix/sql-relaydomains-transport.cf - %{db_driver}:/etc/postfix/sql-relaydomain-aliases-transport.cf %{db_driver}:/etc/postfix/sql-autoreplies-transport.cf ## SASL authentication through Dovecot diff --git a/modoboa_installer/scripts/modoboa.py b/modoboa_installer/scripts/modoboa.py index 7a6e1f5..912c469 100644 --- a/modoboa_installer/scripts/modoboa.py +++ b/modoboa_installer/scripts/modoboa.py @@ -18,7 +18,7 @@ class Modoboa(base.Installer): no_daemon = True packages = [ "python-dev", "libxml2-dev", "libxslt-dev", "libjpeg-dev", - "libcairo2-dev", "rrdtool"] + "librrd-dev", "rrdtool"] with_db = True with_user = True @@ -37,7 +37,7 @@ class Modoboa(base.Installer): def _setup_venv(self): """Prepare a dedicated virtuelenv.""" python.setup_virtualenv(self.venv_path, sudo_user=self.user) - packages = ["modoboa", "python-rrdtool"] + packages = ["modoboa", "rrdtool"] if self.dbengine == "postgres": packages.append("psycopg2") else: @@ -77,3 +77,4 @@ class Modoboa(base.Installer): self._deploy_instance() install("uwsgi", self.config) install("nginx", self.config) + system.add_user_to_group("www-data", self.user)