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

Update from master

Browse Source
This commit is contained in:
Spitap
2022-09-19 15:39:05 +02:00
parent d75d83f202 1f8dd1b5df
commit e30add03fd
17 changed files with 56 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modoboa_installer/scripts/modoboa.py
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")
)
]