Specify mapnik version for CartoCSS

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index a7b9544a30a1354ea5ae8257d6bd78f0e0dfbb86..c82e4cd211adfa60ee3cd3fbc92385b1d9a6e841 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -15,9 +15,6 @@ default_attributes(
         :ignore => %w[in6]
       }
     },
         :ignore => %w[in6]
       }
     },

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

     :modules => [
       "it87"
     ]
     :modules => [
       "it87"
     ]


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

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

     :private_address => "10.0.16.100"
   }
 )
     :private_address => "10.0.16.100"
   }
 )


@@ -56,6 +51,5 @@ run_list(
   "role[bytemark]",
   "role[mail]",
   "role[lists]",
   "role[bytemark]",
   "role[mail]",
   "role[lists]",

-  "role[osqa]",
-  "recipe[blogs]"
+  "role[osqa]"

 )
 )