Revert "Add contact form 7 to blog.openstreetmap.org"

[chef.git] / roles / odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index 6d29b734c076662f7108610106d4cec4b67f1bea..79514889c630e92595ea7d6cf4008ae2f9361ee9 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -18,20 +18,13 @@ default_attributes(
         }
       },
       :external => {
-        :interface => "bond0.2",
+        :interface => "bond0.3",
         :role => :external,
         :inet => {
-          :address => "130.117.76.15",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
+          :address => "184.104.179.143"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:f",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
+          :address => "2001:470:1:fa1::f"
         }
       }
     }
@@ -39,8 +32,6 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
         :effective_cache_size => "16GB"
       }
     }