From 95e2010957056823529f6c4c92645be03bf955ea Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Tue, 28 Jan 2025 13:43:59 +0100
Subject: [PATCH] Few fixes

---
 modoboa_installer/scripts/dovecot.py | 17 ++++++++++++-----
 modoboa_installer/scripts/rspamd.py  | 24 +++++++++++++++---------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/modoboa_installer/scripts/dovecot.py b/modoboa_installer/scripts/dovecot.py
index 98381e6..00dd8c7 100644
--- a/modoboa_installer/scripts/dovecot.py
+++ b/modoboa_installer/scripts/dovecot.py
@@ -28,10 +28,14 @@ class Dovecot(base.Installer):
             "dovecot", "dovecot-pigeonhole"]
     }
     config_files = [
-        "dovecot.conf", "dovecot-dict-sql.conf.ext", "conf.d/10-ssl.conf",
-        "conf.d/10-master.conf", "conf.d/20-lmtp.conf", "conf.d/10-ssl-keys.try",
-        "conf.d/dovecot-oauth2.conf.ext"
-        ]
+        "dovecot.conf",
+        "dovecot-dict-sql.conf.ext",
+        "conf.d/10-ssl.conf",
+        "conf.d/10-master.conf",
+        "conf.d/20-lmtp.conf",
+        "conf.d/10-ssl-keys.try",
+        "conf.d/dovecot-oauth2.conf.ext",
+    ]
     with_user = True
 
     def setup_user(self):
@@ -45,7 +49,10 @@ class Dovecot(base.Installer):
         _config_files = self.config_files
 
         if self.app_config["move_spam_to_junk"]:
-            _config_files += ["conf.d/custom_after_sieve/spam-to-junk.sieve"]
+            _config_files += [
+                "conf.d/custom_after_sieve/spam-to-junk.sieve",
+                "conf.d/90-sieve.conf",
+            ]
 
         return _config_files + [
             "dovecot-sql-{}.conf.ext=dovecot-sql.conf.ext"
diff --git a/modoboa_installer/scripts/rspamd.py b/modoboa_installer/scripts/rspamd.py
index dddd534..6e58fcf 100644
--- a/modoboa_installer/scripts/rspamd.py
+++ b/modoboa_installer/scripts/rspamd.py
@@ -21,15 +21,21 @@ class Rspamd(base.Installer):
             "rspamd", "redis"
         ]
     }
-    config_files = ["local.d/dkim_signing.conf",
-                    "local.d/arc.conf",
-                    "local.d/mx_check.conf",
-                    "local.d/spf.conf",
-                    "local.d/worker-normal.inc",
-                    "local.d/worker-proxy.inc",
-                    "local.d/greylist.conf",
-                    "local.d/milter_headers.conf",
-                    "local.d/metrics.conf"]
+    config_files = [
+        "local.d/arc.conf",
+        "local.d/dkim_signing.conf",
+        "local.d/dmarc.conf",
+        "local.d/force_actions.conf",
+        "local.d/greylist.conf",
+        "local.d/metrics.conf",
+        "local.d/milter_headers.conf",
+        "local.d/mx_check.conf",
+        "local.d/redis.conf",
+        "local.d/settings.conf",
+        "local.d/spf.conf",
+        "local.d/worker-normal.inc",
+        "local.d/worker-proxy.inc",
+    ]
 
     def __init__(self, *args, **kwargs):
         super().__init__(self, *args, **kwargs)