This commit is contained in:
Antoine Nguyen
2016-03-04 15:46:38 +01:00
parent 7eb937aeff
commit 0eeae4b8a9
2 changed files with 12 additions and 9 deletions

View File

@@ -67,16 +67,17 @@ class Modoboa(base.Installer):
"--timezone", self.config.get("modoboa", "timezone"),
"--domain", self.config.get("general", "hostname"),
"--extensions", " ".join(self.extensions),
"--dburl", "default:{0}://{1}:{2}@localhost/{1}".format(
"--dburl", "default:{0}://{1}:{2}@{3}/{1}".format(
self.config.get("database", "engine"), self.dbname,
self.dbpasswd)
self.dbpasswd, self.dbhost)
]
if self.config.getboolean("amavis", "enabled"):
args += [
"amavis:{}://{}:{}@localhost/{}".format(
"amavis:{}://{}:{}@{}/{}".format(
self.config.get("database", "engine"),
self.config.get("amavis", "dbuser"),
self.config.get("amavis", "dbpassword"),
self.dbhost,
self.config.get("amavis", "dbname")
)
]