X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/0f1ae8cdeac706acb963d142843dc3be1838fe59..f9e3e2a61aca2a356d5e3f69b3f3f6f3c6986ce9:/roles/shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index 76e0399f7..03b2cedc3 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"
   }
 )
@@ -54,9 +56,5 @@ run_list(
   "role[bytemark]",
   "role[mail]",
   "role[lists]",
-  "role[subversion]",
-  "role[trac]",
-  "role[osqa]",
-  "role[irc]",
-  "recipe[blogs]"
+  "role[osqa]"
 )