App incompatibility detection, updated for 2.2.0

modoboa_installer/scripts/files/modoboa/supervisor-rq-dkim.tpl

@@ -3,7 +3,7 @@ autostart=true
 autorestart=true
 command=%{venv_path}/bin/python %{home_dir}/instance/manage.py rqworker dkim
 directory=%{home_dir}
-user=%{opendkim_user}
+user=%{dkim_user}
 redirect_stderr=true
 numprocs=1
 stopsignal=TERM

modoboa_installer/scripts/modoboa.py

@@ -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='{}'"

modoboa_installer/scripts/rspamd.py

@@ -60,8 +60,7 @@ class Rspamd(base.Installer):
 
     def install_config_files(self):
         """Make sure config directory exists."""
-        user = self.config.get("modoboa", "user")
-        pw = pwd.getpwnam(user)
+        pw = pwd.getpwnam("_rspamd")
         targets = [
             [self.app_config["dkim_keys_storage_dir"], pw[2], pw[3]]
         ]