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

Few fixes.

Browse Source
This commit is contained in:
Antoine Nguyen
2015-10-15 13:08:57 +02:00
parent 4fa18287e7
commit d1ac5543ce
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modoboa_installer/scripts/files/postfix/main.cf.tpl
View File

@@ -53,8 +53,8 @@ virtual_alias_maps =
relay_domains = relay_domains =
%{db_driver}:/etc/postfix/sql-relaydomains.cf %{db_driver}:/etc/postfix/sql-relaydomains.cf
transport_maps = transport_maps =
%{db_driver}:/etc/postfix/sql-spliteddomains-transport.cf
%{db_driver}:/etc/postfix/sql-relaydomains-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 %{db_driver}:/etc/postfix/sql-autoreplies-transport.cf
## SASL authentication through Dovecot ## SASL authentication through Dovecot

5
modoboa_installer/scripts/modoboa.py
View File

@@ -18,7 +18,7 @@ class Modoboa(base.Installer):
no_daemon = True no_daemon = True
packages = [ packages = [
"python-dev", "libxml2-dev", "libxslt-dev", "libjpeg-dev", "python-dev", "libxml2-dev", "libxslt-dev", "libjpeg-dev",
"libcairo2-dev", "rrdtool"] "librrd-dev", "rrdtool"]
with_db = True with_db = True
with_user = True with_user = True
@@ -37,7 +37,7 @@ class Modoboa(base.Installer):
def _setup_venv(self): def _setup_venv(self):
"""Prepare a dedicated virtuelenv.""" """Prepare a dedicated virtuelenv."""
python.setup_virtualenv(self.venv_path, sudo_user=self.user) python.setup_virtualenv(self.venv_path, sudo_user=self.user)
packages = ["modoboa", "python-rrdtool"] packages = ["modoboa", "rrdtool"]
if self.dbengine == "postgres": if self.dbengine == "postgres":
packages.append("psycopg2") packages.append("psycopg2")
else: else:
@@ -77,3 +77,4 @@ class Modoboa(base.Installer):
self._deploy_instance() self._deploy_instance()
install("uwsgi", self.config) install("uwsgi", self.config)
install("nginx", self.config) install("nginx", self.config)
system.add_user_to_group("www-data", self.user)