Merge branch 'acme-cert-name-option' into 'master'

acme: Add new option acmeCertificateName See merge request simple-nixos-mailserver/nixos-mailserver!303
rspamd: fix duplicate and syntactically wrong header settings
2025-02-05 09:45:15 +01:00 · 2024-03-13 12:59:47 +00:00 · 2024-03-08 14:52:52 +01:00
1 changed files with 1 additions and 9 deletions
--- a/mail-server/rspamd.nix
+++ b/mail-server/rspamd.nix
@ -30,7 +30,7 @@ in
      inherit debug;
      locals = {
          "milter_headers.conf" = { text = ''
-              extended_spam_headers = yes;
+              extended_spam_headers = true;
          ''; };
          "redis.conf" = { text = ''
              servers = "${cfg.redis.address}:${toString cfg.redis.port}";
@ -69,14 +69,6 @@ in
          ''; };
      };

-      overrides = {
-        "milter_headers.conf" = {
-          text = ''
-            extended_spam_headers = true;
-          '';
-        };
-      };
-
      workers.rspamd_proxy = {
        type = "rspamd_proxy";
        bindSockets = [{
Author	SHA1	Message	Date
Matthew Leach	e311c7ab3f	Merge branch 'acme-cert-name-option' into 'master' acme: Add new option acmeCertificateName See merge request simple-nixos-mailserver/nixos-mailserver!303	2024-03-13 12:59:47 +00:00
Christian Theune	572c1b4d69	rspamd: fix duplicate and syntactically wrong header settings Fixes #280	2024-03-08 14:52:52 +01:00