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

Make sure $ characters are not interpreted by shell.

Browse Source 
fix #27
This commit is contained in:
Antoine Nguyen
2016-03-29 14:30:18 +02:00
parent 0584c50092
commit dfbab52ee1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modoboa_installer/scripts/modoboa.py
View File

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