From e5f0e1da44d24ed39993d1ce9d579c286e4045d6 Mon Sep 17 00:00:00 2001 From: andryyy Date: Thu, 24 Sep 2020 20:30:58 +0200 Subject: [PATCH] [Rspamd] Fix prio for includes in overrides --- data/conf/rspamd/override.d/worker-controller.inc | 2 +- data/conf/rspamd/override.d/worker-normal.inc | 2 +- data/conf/rspamd/override.d/worker-proxy.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/conf/rspamd/override.d/worker-controller.inc b/data/conf/rspamd/override.d/worker-controller.inc index 4d4ffe6f..8c929b19 100644 --- a/data/conf/rspamd/override.d/worker-controller.inc +++ b/data/conf/rspamd/override.d/worker-controller.inc @@ -4,4 +4,4 @@ secure_ip = "127.0.0.1"; secure_ip = "::1"; bind_socket = "/var/lib/rspamd/rspamd.sock mode=0666 owner=nobody"; .include(try=true; priority=10) "$CONFDIR/override.d/worker-controller-password.inc" -.include(try=true; priority=20) "$CONFDIR/override.d/worker-controller.custom.inc" +.include(try=true; priority=30) "$CONFDIR/override.d/worker-controller.custom.inc" diff --git a/data/conf/rspamd/override.d/worker-normal.inc b/data/conf/rspamd/override.d/worker-normal.inc index ad6c2b80..c0f1fb14 100644 --- a/data/conf/rspamd/override.d/worker-normal.inc +++ b/data/conf/rspamd/override.d/worker-normal.inc @@ -1,4 +1,4 @@ bind_socket = "*:11333"; task_timeout = 12s; count = 1; -.include(try=true; priority=20) "$CONFDIR/override.d/worker-normal.custom.inc" +.include(try=true; priority=30) "$CONFDIR/override.d/worker-normal.custom.inc" diff --git a/data/conf/rspamd/override.d/worker-proxy.inc b/data/conf/rspamd/override.d/worker-proxy.inc index bff24ca0..9eb47750 100644 --- a/data/conf/rspamd/override.d/worker-proxy.inc +++ b/data/conf/rspamd/override.d/worker-proxy.inc @@ -6,4 +6,4 @@ upstream "local" { hosts = "rspamd:11333" } reject_message = "This message does not meet our delivery requirements"; -.include(try=true; priority=20) "$CONFDIR/override.d/worker-proxy.custom.inc" +.include(try=true; priority=30) "$CONFDIR/override.d/worker-proxy.custom.inc"