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

Use amavis database user.

Browse Source
This commit is contained in:
Antoine Nguyen
2015-10-15 13:38:32 +02:00
parent 36cf28c15d
commit f1c3c806e7
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modoboa_installer/scripts/modoboa.py
View File

@@ -28,13 +28,6 @@ class Modoboa(base.Installer):
super(Modoboa, self).__init__(config) super(Modoboa, self).__init__(config)
self.venv_path = config.get("modoboa", "venv_path") self.venv_path = config.get("modoboa", "venv_path")
def setup_database(self):
"""Additional config."""
super(Modoboa, self).setup_database()
if self.config.getboolean("amavis", "enabled"):
self.backend.grant_access(
self.config.get("amavis", "dbname"), self.dbuser)
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)
@@ -62,7 +55,8 @@ class Modoboa(base.Installer):
args += [ args += [
"amavis:{}://{}:{}@localhost/{}".format( "amavis:{}://{}:{}@localhost/{}".format(
self.config.get("database", "engine"), self.config.get("database", "engine"),
self.user, self.dbpasswd, self.config.get("amavis", "dbuser"),
self.config.get("amavis", "dbpassword"),
self.config.get("amavis", "dbname") self.config.get("amavis", "dbname")
) )
] ]