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

App incompatibility detection, updated for 2.2.0

Browse Source
This commit is contained in:
Spitap
2023-09-06 12:46:20 +02:00
committed by Antoine Nguyen
parent df23f4e181
commit 70e9cffd87
7 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modoboa_installer/scripts/modoboa.py
View File

@@ -248,6 +248,7 @@ class Modoboa(base.Installer):
"dovecot_mailboxes_owner": (
self.config.get("dovecot", "mailboxes_owner")),
"opendkim_user": self.config.get("opendkim", "user"),
"dkim_user": "_rspamd" if self.config.getboolean("rspamd", "enabled") else self.config.get("opendkim", "user")
"minutes": random.randint(1, 59),
"hours": f"{random_hour},{random_hour+12}",
"modoboa_2_2_or_greater": "" if self.modoboa_2_2_or_greater else "#",
@@ -291,6 +292,15 @@ class Modoboa(base.Installer):
if self.config.getboolean("opendkim", "enabled"):
settings["admin"]["dkim_keys_storage_dir"] = (
self.config.get("opendkim", "keys_storage_dir"))
if self.config.getboolean("rspamd", "enabled"):
settings["admin"]["dkim_keys_storage_dir"] = (
self.config.get("rspamd", "dkim_keys_storage_dir"))
settings["modoboa_rspamd"]["key_map_path"] = (
self.config.get("rspamd", "key_map_path"))
settings["modoboa_rspamd"]["selector_map_path"] = (
self.config.get("rspamd", "selector_map_path"))
settings = json.dumps(settings)
query = (
"UPDATE core_localconfig SET _parameters='{}'"