mediawiki: Remove xbl.spamhaus.org DNSBL

[chef.git] / roles / spike-06.rb

diff --git a/roles/spike-06.rb b/roles/spike-06.rb
index b9b414190bcec952dcbc35ebd64dafef972af928..9282ce5dbb952fd271f61bdfcc341be84cd941c1 100644 (file)
--- a/roles/spike-06.rb
+++ b/roles/spike-06.rb
@@ -8,7 +8,7 @@ default_attributes(
         :interface => "bond0",
         :role => :internal,
         :inet => {
         :interface => "bond0",
         :role => :internal,
         :inet => {

-          :address => "10.0.48.11"
+          :address => "10.0.48.6"

         },
         :bond => {
           :mode => "802.3ad",
         },
         :bond => {
           :mode => "802.3ad",


@@ -17,38 +17,14 @@ default_attributes(
           :slaves => %w[eno1 eno2]
         }
       },
           :slaves => %w[eno1 eno2]
         }
       },

-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.11",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:b",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
-        }
-      },

       :external => {
         :interface => "bond0.3",
         :role => :external,
       :external => {
         :interface => "bond0.3",
         :role => :external,

-        :source_route_table => 150,

         :inet => {
         :inet => {

-          :address => "184.104.179.139",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.134"

         },
         :inet6 => {
         },
         :inet6 => {

-          :address => "2001:470:1:fa1::b",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::6"

         }
       }
     }
         }
       }
     }