Unverified Commit 04985034 authored by Luke Granger-Brown's avatar Luke Granger-Brown Committed by GitHub
Browse files

Merge pull request #121540 from lukegb/postfix-compat 

nixos/tests/rspamd: fix OOM flakyness
parents 4e06e6e0 a6fb22a6

nixos/modules/services/mail/postfix.nix

+1 −1
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ in 
        };



      services.postfix.config = (mapAttrs (_: v: mkDefault v) {

        compatibility_level  = "9999";

        compatibility_level  = pkgs.postfix.version;

        mail_owner           = cfg.user;

        default_privs        = "nobody";

nixos/tests/rspamd.nix

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ let 
    machine = {

      services.rspamd.enable = true;

      networking.enableIPv6 = enableIPv6;

      virtualisation.memorySize = 1024;

    };

    testScript = ''

      start_all()
@@ -68,6 +69,7 @@ in 
          group = "rspamd";

        }];

      };

      virtualisation.memorySize = 1024;

    };



    testScript = ''
@@ -116,6 +118,7 @@ in 
          '';

        };

      };

      virtualisation.memorySize = 1024;

    };



    testScript = ''
@@ -221,6 +224,7 @@ in 
          rspamd_logger.infox(rspamd_config, 'Work dammit!!!')

        '';

      };

      virtualisation.memorySize = 1024;

    };

    testScript = ''

      ${initMachine}
@@ -287,6 +291,7 @@ in 
        postfix.enable = true;

        workers.rspamd_proxy.type = "rspamd_proxy";

      };

      virtualisation.memorySize = 1024;

    };

    testScript = ''

      ${initMachine}