Complete custom database port support

This commit is contained in:
Antoine Nguyen
2022-09-15 10:43:44 +02:00
parent 062ad0d9f3
commit 23ac0bf172
11 changed files with 22 additions and 15 deletions

View File

@@ -144,20 +144,22 @@ class Modoboa(base.Installer):
"--domain", self.config.get("general", "hostname"),
"--extensions", " ".join(self.extensions),
"--dont-install-extensions",
"--dburl", "'default:{}://{}:{}@{}/{}'".format(
"--dburl", "'default:{}://{}:{}@{}:{}/{}'".format(
self.config.get("database", "engine"),
self.dbuser, self.dbpasswd, self.dbhost, self.dbname
self.dbuser, self.dbpasswd, self.dbhost, self.dbport,
self.dbname
)
]
if self.devmode:
args = ["--devel"] + args
if self.amavis_enabled:
args += [
"'amavis:{}://{}:{}@{}/{}'".format(
"'amavis:{}://{}:{}@{}:{}/{}'".format(
self.config.get("database", "engine"),
self.config.get("amavis", "dbuser"),
self.config.get("amavis", "dbpassword"),
self.dbhost,
self.dbport,
self.config.get("amavis", "dbname")
)
]