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

Fixed SQL query.

Browse Source
This commit is contained in:
Antoine Nguyen
2017-03-03 18:34:50 +01:00
parent 4b3d812a68
commit 5de629cfd1
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modoboa_installer/database.py
View File

@@ -61,8 +61,8 @@ class PostgreSQL(Database):
if dbname and dbuser: if dbname and dbuser:
self._setup_pgpass(dbname, dbuser, dbpassword) self._setup_pgpass(dbname, dbuser, dbpassword)
cmd += " -h {} -d {} -U {} -w".format(self.dbhost, dbname, dbuser) cmd += " -h {} -d {} -U {} -w".format(self.dbhost, dbname, dbuser)
utils.exec_cmd( cmd = "{} -c '{}' ".format(cmd, query)
"""{} -c "{}" """.format(cmd, query), sudo_user=self.dbuser) utils.exec_cmd(cmd, sudo_user=self.dbuser)
def create_user(self, name, password): def create_user(self, name, password):
"""Create a user.""" """Create a user."""

37
modoboa_installer/scripts/modoboa.py
View File

@@ -1,5 +1,6 @@
"""Modoboa related tasks.""" """Modoboa related tasks."""
import json
import os import os
import pwd import pwd
import shutil import shutil
@@ -147,24 +148,30 @@ class Modoboa(base.Installer):
for d in [rrd_root_dir, pdf_storage_dir, webmail_media_dir]: for d in [rrd_root_dir, pdf_storage_dir, webmail_media_dir]:
utils.mkdir(d, stat.S_IRWXU | stat.S_IRWXG, pw[2], pw[3]) utils.mkdir(d, stat.S_IRWXU | stat.S_IRWXG, pw[2], pw[3])
settings = { settings = {
"admin.HANDLE_MAILBOXES": "yes", "admin": {
"admin.AUTO_ACCOUNT_REMOVAL": "yes", "handle_mailboxes": True,
"modoboa_amavis.AM_PDP_MODE": "inet", "account_auto_removal": True
"modoboa_stats.RRD_ROOTDIR": rrd_root_dir, },
"modoboa_pdfcredentials.STORAGE_DIR": pdf_storage_dir, "modoboa_amavis": {
"am_pdp_mode": "inet",
},
"modoboa_stats": {
"rrd_rootdir": rrd_root_dir,
},
"modoboa_pdfcredentials": {
"storage_dir": pdf_storage_dir
}
} }
for path in ["/var/log/maillog", "/var/log/mail.log"]: for path in ["/var/log/maillog", "/var/log/mail.log"]:
if os.path.exists(path): if os.path.exists(path):
settings["modoboa_stats.LOGFILE"] = path settings["modoboa_stats"]["logfile"] = path
settings = json.dumps(settings)
for name, value in settings.items(): query = (
query = ( "UPDATE core_localconfig SET _parameters='\"'\"'{}'\"'\"'"
"DELETE FROM lib_parameter WHERE name='{0}';" .format(settings)
"INSERT INTO lib_parameter (name, value) VALUES ('{0}', '{1}')" )
.format(name, value) self.backend._exec_query(
) query, self.dbname, self.dbuser, self.dbpasswd)
self.backend._exec_query(
query, self.dbname, self.dbuser, self.dbpasswd)
def post_run(self): def post_run(self):
"""Additional tasks.""" """Additional tasks."""