From 578011c78c5cfa71d792adb0a881539bfa9206be Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Wed, 21 Jun 2017 10:18:52 +0200
Subject: [PATCH] Move milter config, increase timeout for DNS

---
 data/conf/rspamd/local.d/options.inc         | 6 +++++-
 data/conf/rspamd/local.d/rspamd.conf.local   | 9 ---------
 data/conf/rspamd/override.d/worker-proxy.inc | 7 +++++++
 3 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 data/conf/rspamd/override.d/worker-proxy.inc

diff --git a/data/conf/rspamd/local.d/options.inc b/data/conf/rspamd/local.d/options.inc
index fd013d1b..17b8aa12 100644
--- a/data/conf/rspamd/local.d/options.inc
+++ b/data/conf/rspamd/local.d/options.inc
@@ -1,4 +1,8 @@
 dns {
-    enable_dnssec = true;
+  enable_dnssec = true;
 }
 map_watch_interval = 15s;
+dns {
+  timeout = 4s;
+  retransmits = 5;
+}
diff --git a/data/conf/rspamd/local.d/rspamd.conf.local b/data/conf/rspamd/local.d/rspamd.conf.local
index 59ee36f4..735ed822 100644
--- a/data/conf/rspamd/local.d/rspamd.conf.local
+++ b/data/conf/rspamd/local.d/rspamd.conf.local
@@ -3,12 +3,3 @@ history_redis {}
 worker "log_helper" {
   count = 1;
 }
-worker "rspamd_proxy" {
-  bind_socket = "rspamd:9900";
-  milter = true;
-  upstream {
-    name = "localhost";
-    default = true;
-    hosts = "rspamd:11333"
-  }
-}
diff --git a/data/conf/rspamd/override.d/worker-proxy.inc b/data/conf/rspamd/override.d/worker-proxy.inc
new file mode 100644
index 00000000..b87c7f29
--- /dev/null
+++ b/data/conf/rspamd/override.d/worker-proxy.inc
@@ -0,0 +1,7 @@
+bind_socket = "rspamd:9900";
+milter = true;
+upstream {
+  name = "localhost";
+  default = true;
+  hosts = "rspamd:11333"
+}