public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #121540 from lukegb/postfix-compat

Browse Source 
nixos/tests/rspamd: fix OOM flakyness
This commit is contained in:
Luke Granger-Brown 2021-05-03 17:36:46 +01:00 committed by GitHub
commit 049850341e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/mail/postfix.nix
View File

@ -773,7 +773,7 @@ in
}; };
services.postfix.config = (mapAttrs (_: v: mkDefault v) { services.postfix.config = (mapAttrs (_: v: mkDefault v) {
compatibility_level = "9999"; compatibility_level = pkgs.postfix.version;
mail_owner = cfg.user; mail_owner = cfg.user;
default_privs = "nobody"; default_privs = "nobody";

5
nixos/tests/rspamd.nix
View File

@ -25,6 +25,7 @@ let
machine = { machine = {
services.rspamd.enable = true; services.rspamd.enable = true;
networking.enableIPv6 = enableIPv6; networking.enableIPv6 = enableIPv6;
virtualisation.memorySize = 1024;
}; };
testScript = '' testScript = ''
start_all() start_all()
@ -68,6 +69,7 @@ in
group = "rspamd"; group = "rspamd";
}]; }];
}; };
virtualisation.memorySize = 1024;
}; };
testScript = '' testScript = ''
@ -116,6 +118,7 @@ in
''; '';
}; };
}; };
virtualisation.memorySize = 1024;
}; };
testScript = '' testScript = ''
@ -221,6 +224,7 @@ in
rspamd_logger.infox(rspamd_config, 'Work dammit!!!') rspamd_logger.infox(rspamd_config, 'Work dammit!!!')
''; '';
}; };
virtualisation.memorySize = 1024;
}; };
testScript = '' testScript = ''
${initMachine} ${initMachine}
@ -287,6 +291,7 @@ in
postfix.enable = true; postfix.enable = true;
workers.rspamd_proxy.type = "rspamd_proxy"; workers.rspamd_proxy.type = "rspamd_proxy";
}; };
virtualisation.memorySize = 1024;
}; };
testScript = '' testScript = ''
${initMachine} ${initMachine}