From: Grant Slater <git@firefishy.com>
Date: Fri, 8 Jul 2022 14:29:26 +0000 (+0300)
Subject: shenron: Use Google DNS to avoid spamhaus issue
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/4c9a8da636f6488e9e33fef896353ead44832619

shenron: Use Google DNS to avoid spamhaus issue
---

diff --git a/roles/shenron.rb b/roles/shenron.rb
index 76e0399f7..27a10f9c1 100644
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -45,7 +45,9 @@ override_attributes(
         :gateway => "fe80::1"
       }
     },
-    :nameservers => ["1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001"],
+    # Do not use Cloudflare Public DNS as it does not support ECS as required by https://www.spamhaus.org/organization/dnsblusage/
+    # https://www.spamhaus.org/news/article/816/service-update-spamhaus-dnsbl-users-who-query-via-cloudflare-dns-need-to-make-changes-to-email-set-up
+    :nameservers => ["8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844"],
     :private_address => "10.0.16.100"
   }
 )