Merge branch 'rspamd-local-networks' into 'master'
rspamd: restrict addresses we disable checks for to localhost Closes #326 See merge request simple-nixos-mailserver/nixos-mailserver!444
This commit is contained in:
commit
b49ae46f22
2 changed files with 19 additions and 8 deletions
|
@ -132,6 +132,13 @@ in
|
|||
'';
|
||||
};
|
||||
};
|
||||
overrides = {
|
||||
"options.inc" = {
|
||||
text = ''
|
||||
local_addrs = [::1/128, 127.0.0.0/8]
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
workers.rspamd_proxy = {
|
||||
type = "rspamd_proxy";
|
||||
|
|
|
@ -10,12 +10,16 @@
|
|||
# Enable second CPU core
|
||||
virtualisation.cores = lib.mkDefault 2;
|
||||
|
||||
# Don't make tests block on DNS requests that will never succeed
|
||||
services.rspamd.locals."options.inc".text = ''
|
||||
dns {
|
||||
nameservers = ["127.0.0.1"];
|
||||
timeout = 0.0s;
|
||||
retransmits = 0;
|
||||
}
|
||||
'';
|
||||
services.rspamd = {
|
||||
# Don't make tests block on DNS requests that will never succeed
|
||||
locals."options.inc".text = ''
|
||||
dns {
|
||||
nameservers = ["127.0.0.1"];
|
||||
timeout = 0.0s;
|
||||
retransmits = 0;
|
||||
}
|
||||
'';
|
||||
# Relax `local_addrs` definition to default for tests, so mail doesn't get flagged as spam
|
||||
overrides."options.inc".enable = false;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue