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

Merge pull request #6 from emsit/master

Browse Source 
Fix Webmail [AUTHENTICATIONFAILED] on MySQL
This commit is contained in:
Antoine Nguyen
2015-10-31 14:39:07 +01:00
parent af2ac6d1df 508754c961
commit 722c619e2d
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
modoboa_installer/scripts/dovecot.py
View File

@@ -50,20 +50,19 @@ class Dovecot(base.Installer):
def post_run(self): def post_run(self):
"""Additional tasks.""" """Additional tasks."""
if self.dbengine != "postgres": if self.dbengine == "postgres":
return dbname = self.config.get("modoboa", "dbname")
dbname = self.config.get("modoboa", "dbname") dbuser = self.config.get("modoboa", "dbuser")
dbuser = self.config.get("modoboa", "dbuser") dbpassword = self.config.get("modoboa", "dbpassword")
dbpassword = self.config.get("modoboa", "dbpassword") backend = database.get_backend(self.config)
backend = database.get_backend(self.config) backend.load_sql_file(
backend.load_sql_file( dbname, dbuser, dbpassword,
dbname, dbuser, dbpassword, self.get_file_path("install_modoboa_postgres_trigger.sql")
self.get_file_path("install_modoboa_postgres_trigger.sql") )
) backend.load_sql_file(
backend.load_sql_file( dbname, dbuser, dbpassword,
dbname, dbuser, dbpassword, self.get_file_path("fix_modoboa_postgres_schema.sql")
self.get_file_path("fix_modoboa_postgres_schema.sql") )
)
for f in glob.glob("{}/*".format(self.get_file_path("conf.d"))): for f in glob.glob("{}/*".format(self.get_file_path("conf.d"))):
shutil.copy(f, "{}/conf.d".format(self.config_dir)) shutil.copy(f, "{}/conf.d".format(self.config_dir))