From: korgoth1 <vladislav.stakhov@gmail.com>
Date: Thu, 16 Jan 2020 12:59:23 +0000 (+0300)
Subject: [Test] SPF external IP map
X-Git-Tag: 2.3~93^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=70bea4abb43f1d0c287f33a5c68c061fb87c8e93;p=rspamd.git

[Test] SPF external IP map
---

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"
+  #];
 }