Merge pull request #121540 from lukegb/postfix-compat

nixos/tests/rspamd: fix OOM flakyness

Changed files
+6 -1
nixos
modules
services
tests
+1 -1
nixos/modules/services/mail/postfix.nix
···
};
services.postfix.config = (mapAttrs (_: v: mkDefault v) {
-
compatibility_level = "9999";
+
compatibility_level = pkgs.postfix.version;
mail_owner = cfg.user;
default_privs = "nobody";
+5
nixos/tests/rspamd.nix
···
machine = {
services.rspamd.enable = true;
networking.enableIPv6 = enableIPv6;
+
virtualisation.memorySize = 1024;
};
testScript = ''
start_all()
···
group = "rspamd";
}];
};
+
virtualisation.memorySize = 1024;
};
testScript = ''
···
'';
};
};
+
virtualisation.memorySize = 1024;
};
testScript = ''
···
rspamd_logger.infox(rspamd_config, 'Work dammit!!!')
'';
};
+
virtualisation.memorySize = 1024;
};
testScript = ''
${initMachine}
···
postfix.enable = true;
workers.rspamd_proxy.type = "rspamd_proxy";
};
+
virtualisation.memorySize = 1024;
};
testScript = ''
${initMachine}