zaphyra's git: nixfiles

config/nixos/modules/presets/katja/mailServer: improve config, enable dmarc-reporting and fts

diff --git a/config/nixos/modules/presets/katja/mailServer.nix b/config/nixos/modules/presets/katja/mailServer.nix
@@ -111,7 +111,7 @@ in
             subdomains = {
               autoconfig.CNAME = [ "${cfg.hostName}." ];
               _dmarc.TXT = [ DMARC ];
-              "mail._domainkey".TXT = [ cfg.primaryDomainDkimKey ];
+              "${config.mailserver.dkimSelector}._domainkey".TXT = [ cfg.primaryDomainDkimKey ];
             };
           };
         };

@@ -136,7 +136,6 @@ in
       ];
 
       services = {
-        redis.servers.rspamd.bind = "::1";
         dovecot2.sieve.extensions = [ "editheader" ];
         nginx = {
           enable = true;

@@ -158,11 +157,7 @@ in
         localDnsResolver = false;
         virusScanning = false;
 
-        redis.address = "[::1]";
-
-        certificateScheme = "manual";
-        certificateFile = "${config.security.acme.certs.${cfg.hostName}.directory}/fullchain.pem";
-        keyFile = "${config.security.acme.certs.${cfg.hostName}.directory}/key.pem";
+        certificateScheme = "acme";
 
         enableManageSieve = true;
         enableSubmission = true;

@@ -172,6 +167,13 @@ in
         enablePop3 = false;
         enablePop3Ssl = false;
 
+        fullTextSearch.enable = true;
+        dmarcReporting = {
+          enable = true;
+          domain = "zaphyra.eu";
+          organizationName = "zaphyra-mail";
+        };
+
         mailDirectory = "/var/lib/mailboxes";
         sieveDirectory = "/var/lib/sieve";
         dkimKeyDirectory = "/var/lib/dkimKeys";