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

Refactoring

Browse Source
This commit is contained in:
Spitap
2022-12-27 20:27:28 +01:00
parent 24f231bf1d
commit a94b5ac4b7
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modoboa_installer/scripts/opendkim.py
View File

@@ -115,8 +115,7 @@ class Opendkim(base.Installer):
"""Restore keys.""" """Restore keys."""
dkim_keys_backup = os.path.join( dkim_keys_backup = os.path.join(
self.archive_path, "custom/dkim") self.archive_path, "custom/dkim")
keys_storage_dir = self.config.get( keys_storage_dir = self.app_config["keys_storage_dir"]
"opendkim", "keys_storage_dir", fallback="/var/lib/dkim")
if os.path.isdir(dkim_keys_backup): if os.path.isdir(dkim_keys_backup):
for file in os.listdir(dkim_keys_backup): for file in os.listdir(dkim_keys_backup):
file_path = os.path.join(dkim_keys_backup, file) file_path = os.path.join(dkim_keys_backup, file)
@@ -129,9 +128,7 @@ class Opendkim(base.Installer):
def custom_backup(self, path): def custom_backup(self, path):
"""Backup DKIM keys.""" """Backup DKIM keys."""
storage_dir = self.config.get( if os.path.isdir(self.app_config["keys_storage_dir"]):
"opendkim", "keys_storage_dir", fallback="/var/lib/dkim") shutil.copytree(self.app_config["keys_storage_dir"], os.path.join(path, "dkim"))
if os.path.isdir(storage_dir):
shutil.copytree(storage_dir, os.path.join(path, "dkim"))
utils.printcolor( utils.printcolor(
"DKIM keys saved!", utils.GREEN) "DKIM keys saved!", utils.GREEN)