From c1ededd4ebbffd416b4978d8a4b1c2be6283081d Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 14 Oct 2015 20:19:25 +0200 Subject: [PATCH] Fix dovecot installer. --- modoboa_installer/scripts/base.py | 6 +++++- modoboa_installer/scripts/dovecot.py | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modoboa_installer/scripts/base.py b/modoboa_installer/scripts/base.py index 5efa338..241d382 100644 --- a/modoboa_installer/scripts/base.py +++ b/modoboa_installer/scripts/base.py @@ -110,8 +110,12 @@ class Installer(object): return context = self.get_template_context() for ftpl in config_files: + if "=" in ftpl: + ftpl, dstname = ftpl.split("=") + else: + dstname = ftpl src = self.get_file_path("{}.tpl".format(ftpl)) - dst = os.path.join(self.config_dir, ftpl) + dst = os.path.join(self.config_dir, dstname) utils.copy_from_template(src, dst, context) def restart_daemon(self): diff --git a/modoboa_installer/scripts/dovecot.py b/modoboa_installer/scripts/dovecot.py index 2ff234c..36dc586 100644 --- a/modoboa_installer/scripts/dovecot.py +++ b/modoboa_installer/scripts/dovecot.py @@ -26,7 +26,9 @@ class Dovecot(base.Installer): def get_config_files(self): """Additional config files.""" return self.config_files + [ - "dovecot-sql-{}.conf.ext".format(self.dbengine)] + "dovecot-sql-{}.conf.ext=dovecot-sql.conf.ext" + .format(self.dbengine) + ] def get_packages(self): """Additional packages."""