From 24f231bf1da253961d9c4e2231f040ba48897f1d Mon Sep 17 00:00:00 2001 From: Spitap Date: Sun, 27 Nov 2022 13:57:35 +0100 Subject: [PATCH 1/2] fixed dkim permsissions --- modoboa_installer/scripts/opendkim.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modoboa_installer/scripts/opendkim.py b/modoboa_installer/scripts/opendkim.py index 0379221..e1e0a14 100644 --- a/modoboa_installer/scripts/opendkim.py +++ b/modoboa_installer/scripts/opendkim.py @@ -115,13 +115,17 @@ class Opendkim(base.Installer): """Restore keys.""" dkim_keys_backup = os.path.join( self.archive_path, "custom/dkim") + keys_storage_dir = self.config.get( + "opendkim", "keys_storage_dir", fallback="/var/lib/dkim") if os.path.isdir(dkim_keys_backup): for file in os.listdir(dkim_keys_backup): file_path = os.path.join(dkim_keys_backup, file) if os.path.isfile(file_path): - utils.copy_file(file_path, self.config.get( - "opendkim", "keys_storage_dir", fallback="/var/lib/dkim")) + utils.copy_file(file_path, keys_storage_dir) utils.success("DKIM keys restored from backup") + # Setup permissions + user = self.config.get("opendkim", "user") + utils.exec_cmd(f"chown -R {user}:{user} {keys_storage_dir}") def custom_backup(self, path): """Backup DKIM keys.""" From a94b5ac4b76db8542951bb922446cf9ab806d9eb Mon Sep 17 00:00:00 2001 From: Spitap Date: Tue, 27 Dec 2022 20:27:28 +0100 Subject: [PATCH 2/2] Refactoring --- modoboa_installer/scripts/opendkim.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/modoboa_installer/scripts/opendkim.py b/modoboa_installer/scripts/opendkim.py index e1e0a14..fea60a7 100644 --- a/modoboa_installer/scripts/opendkim.py +++ b/modoboa_installer/scripts/opendkim.py @@ -115,8 +115,7 @@ class Opendkim(base.Installer): """Restore keys.""" dkim_keys_backup = os.path.join( self.archive_path, "custom/dkim") - keys_storage_dir = self.config.get( - "opendkim", "keys_storage_dir", fallback="/var/lib/dkim") + keys_storage_dir = self.app_config["keys_storage_dir"] if os.path.isdir(dkim_keys_backup): for file in os.listdir(dkim_keys_backup): file_path = os.path.join(dkim_keys_backup, file) @@ -129,9 +128,7 @@ class Opendkim(base.Installer): def custom_backup(self, path): """Backup DKIM keys.""" - storage_dir = self.config.get( - "opendkim", "keys_storage_dir", fallback="/var/lib/dkim") - if os.path.isdir(storage_dir): - shutil.copytree(storage_dir, os.path.join(path, "dkim")) + if os.path.isdir(self.app_config["keys_storage_dir"]): + shutil.copytree(self.app_config["keys_storage_dir"], os.path.join(path, "dkim")) utils.printcolor( "DKIM keys saved!", utils.GREEN)