From 2665e18c0acc99292849c34a95723e8390e4db68 Mon Sep 17 00:00:00 2001 From: Spitap Date: Tue, 27 Dec 2022 19:42:01 +0100 Subject: [PATCH] Fixed config file not copied on new install --- modoboa_installer/scripts/postwhite.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modoboa_installer/scripts/postwhite.py b/modoboa_installer/scripts/postwhite.py index 30bcb14..a8aaa49 100644 --- a/modoboa_installer/scripts/postwhite.py +++ b/modoboa_installer/scripts/postwhite.py @@ -47,8 +47,11 @@ class Postwhite(base.Installer): self.install_from_archive(SPF_TOOLS_REPOSITORY, install_dir) self.postw_dir = self.install_from_archive( POSTWHITE_REPOSITORY, install_dir) - postw_bin = os.path.join(self.postw_dir, "postwhite") - utils.exec_cmd("{} /etc/postwhite.conf".format(postw_bin)) + utils.copy_file( + os.path.join(self.postw_dir, "postwhite.conf"), self.config_dir) + self.postw_bin = os.path.join(self.postw_dir, "postwhite") + utils.exec_cmd("{} /etc/postwhite.conf".format(self.postw_bin)) + def custom_backup(self, path): """Backup custom configuration if any.""" @@ -65,6 +68,3 @@ class Postwhite(base.Installer): if os.path.isfile(postwhite_backup_configuration): utils.copy_file(postwhite_backup_configuration, self.config_dir) utils.success("postwhite.conf restored from backup") - else: - utils.copy_file( - os.path.join(self.postw_dir, "postwhite.conf"), self.config_dir)