supybot: remove old osm2pgsql branches

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index e614a33262ff39b6eb2882d112388979ff4d0d02..27a10f9c1af6bc77a0938df456c0fd8b8e0996cb 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -10,6 +10,11 @@ default_attributes(
     }
   },
   :hardware => {
     }
   },
   :hardware => {

+    :hwmon => {
+      "platform_it87_552" => {
+        :ignore => %w[in6]
+      }
+    },

     :mcelog => {
       :enabled => false
     },
     :mcelog => {
       :enabled => false
     },


@@ -21,6 +26,7 @@ default_attributes(
 
 override_attributes(
   :networking => {
 
 override_attributes(
   :networking => {

+    :dnssec => "false",

     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",
     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",


@@ -39,7 +45,9 @@ override_attributes(
         :gateway => "fe80::1"
       }
     },
         :gateway => "fe80::1"
       }
     },

-    :nameservers => ["89.16.162.20", "2001:41c9:2:d6::20"],
+    # 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"
   }
 )
     :private_address => "10.0.16.100"
   }
 )