7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Rspamd] Remove DKIM forced action, move ratelimit lua, add meta exporter

Browse Source
This commit is contained in:
andre.peters
2017-12-09 09:08:18 +01:00
parent c8f41cdae2
commit 873222d5f8
13 changed files with 172 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/conf/rspamd/override.d/logging.inc
View File

@@ -1,3 +1,4 @@
type = "console";
systemd = false;
.include "$CONFDIR/logging.inc"
.include(try=true; priority=20) "$CONFDIR/override.d/logging.custom.inc"

2
data/conf/rspamd/override.d/ratelimit.conf
View File

@@ -9,6 +9,6 @@ rates {
}
whitelisted_rcpts = "postmaster,mailer-daemon";
max_rcpt = 5;
custom_keywords = "/etc/rspamd/custom/ratelimit.lua";
custom_keywords = "/etc/rspamd/lua/ratelimit.lua";
user_keywords = ["user", "customrl"];
dynamic_rates = { customrl = "customrl"}

3
data/conf/rspamd/override.d/worker-controller.inc
View File

@@ -1,8 +1,9 @@
bind_socket = "*:11334";
enable_password = "$2$pppq86q9uns51zd5ekfxecj7bxwaefo3$p7f9xdhamydjhtypcr639it3kqeiknx3dk9on7skjypyi8uwwcmy";
secure_ip = "192.168.0.0/16";
secure_ip = "172.16.0.0/12";
secure_ip = "10.0.0.0/8";
secure_ip = "127.0.0.1";
secure_ip = "::1";
secure_ip = "fd4d:6169:6c63:6f77::/64"
.include(try=true; priority=10) "$CONFDIR/override.d/worker-controller-password.inc"
.include(try=true; priority=20) "$CONFDIR/override.d/worker-controller.custom.inc"

1
data/conf/rspamd/override.d/worker-normal.inc
View File

@@ -1,2 +1,3 @@
bind_socket = "*:11333";
task_timeout = 12s;
.include(try=true; priority=20) "$CONFDIR/override.d/worker-normal.custom.inc"

1
data/conf/rspamd/override.d/worker-proxy.inc
View File

@@ -5,3 +5,4 @@ upstream {
default = true;
hosts = "rspamd:11333"
}
.include(try=true; priority=20) "$CONFDIR/override.d/worker-proxy.custom.inc"