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

Fix for postgres.

Browse Source 
see #1
This commit is contained in:
Antoine Nguyen
2015-10-26 08:20:30 +01:00
parent bd86aa6544
commit e9f825f70b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
installer.cfg
View File

@@ -4,8 +4,8 @@ tls_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem
[database] [database]
# Select database engine : postgres or mysql # Select database engine : postgres or mysql
#engine = postgres engine = postgres
engine = mysql #engine = mysql
host = 127.0.0.1 host = 127.0.0.1
install = true install = true

1
modoboa_installer/database.py
View File

@@ -45,6 +45,7 @@ class PostgreSQL(Database):
"""Exec a postgresql query.""" """Exec a postgresql query."""
cmd = "psql" cmd = "psql"
if dbname and dbuser: if dbname and dbuser:
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( utils.exec_cmd(
"""{} -c "{}" """.format(cmd, query), sudo_user=self.dbuser) """{} -c "{}" """.format(cmd, query), sudo_user=self.dbuser)