Revert "community: Fix CSRF issue with monkey patch fix"

[chef.git] / roles / equinix-dub.rb

diff --git a/roles/equinix-dub.rb b/roles/equinix-dub.rb
index 94a8989e1d8128ec42a6b2111cc95211f2b6f223..6561d30193bec5aa45adad36296b8234de8e223e 100644 (file)
--- a/roles/equinix-dub.rb
+++ b/roles/equinix-dub.rb
@@ -12,9 +12,6 @@ default_attributes(
     }
   },
   :networking => {
     }
   },
   :networking => {

-    :firewall => {
-      :engine => "nftables"
-    },

     :roles => {
       :internal => {
         :inet => {
     :roles => {
       :internal => {
         :inet => {


@@ -27,29 +24,30 @@ default_attributes(
       },
       :external => {
         :zone => "dub",
       },
       :external => {
         :zone => "dub",

-        :inet => {
-          :prefix => "27",
-          :gateway => "184.104.226.97"
-        },

         :inet6 => {
         :inet6 => {

-          :prefix => "64",
-          :gateway => "2001:470:1:b3b::1",
-          :routes => {
-            "2001:978:2:2c::/64" => { :type => "unreachable" }
-          }
+          :rules => [
+            { :to => "2600:9000::/28", :table => 150, :priority => 100 }
+          ]

         }
       }
     }
   },
         }
       }
     }
   },

+  :prometheus => {
+    :metrics => {
+      :host_location => {
+        :help => "Host location",
+        :labels => { :site => "dublin" }
+      }
+    }
+  },

   :web => {
   :web => {

-    :fileserver => "fafnir",

     :readonly_database_host => "snap-03.dub.openstreetmap.org"
   }
 )
 
 override_attributes(
   :networking => {
     :readonly_database_host => "snap-03.dub.openstreetmap.org"
   }
 )
 
 override_attributes(
   :networking => {

-    :nameservers => ["10.0.64.2", "8.8.8.8", "8.8.4.4"],
+    :nameservers => ["10.0.64.2", "74.82.42.42", "2001:470:20::2"],

     :search => ["dub.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {
     :search => ["dub.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {