commit 70bea4a: [Test] SPF external IP map

[korgoth1]

Author: korgoth1
Date: 2020-01-16 15:59:23 +0300
URL: https://github.com/rspamd/rspamd/commit/70bea4abb43f1d0c287f33a5c68c061fb87c8e93

[Test] SPF external IP map

---
 conf/maps.d/external_relay_ip.inc |  1 -
 conf/maps.d/surbl-whitelist.inc   |  1 -
 conf/modules.d/spf.conf           | 10 +++++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/conf/maps.d/external_relay_ip.inc b/conf/maps.d/external_relay_ip.inc
deleted file mode 100644
index 3fc5c1775..000000000
--- a/conf/maps.d/external_relay_ip.inc
+++ /dev/null
@@ -1 +0,0 @@
-192.168.1.1
\ No newline at end of file
diff --git a/conf/maps.d/surbl-whitelist.inc b/conf/maps.d/surbl-whitelist.inc
index 1c56f9a51..401c1cec9 100644
--- a/conf/maps.d/surbl-whitelist.inc
+++ b/conf/maps.d/surbl-whitelist.inc
@@ -1,4 +1,3 @@
-  
 126.com
 163.com
 1gost.info
diff --git a/conf/modules.d/spf.conf b/conf/modules.d/spf.conf
index cf0862909..a09e70d6b 100644
--- a/conf/modules.d/spf.conf
+++ b/conf/modules.d/spf.conf
@@ -19,9 +19,9 @@ spf {
   .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/spf.conf"
   .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/spf.conf"
 
-  external_relay = [
-    "$LOCAL_CONFDIR/local.d/maps.d/external_relay_ip.inc.local",
-    "${DBDIR}/surbl-external_relay_ip.inc.local",
-    "fallback+file://${CONFDIR}/maps.d/external_relay_ip.inc"
-  ];
+  #external_relay = [
+    #"$LOCAL_CONFDIR/local.d/maps.d/external_relay_ip.inc.local",
+    #"${DBDIR}/surbl-external_relay_ip.inc.local",
+    #"fallback+file://${CONFDIR}/maps.d/external_relay_ip.inc"
+  #];
 }