Drop support for old UCL locations

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index d5fd177f8d2e22ff87d09d219d3eb6da7066ff8f..84a38aa064586d3e115f56522876383085600fe2 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -7,15 +7,35 @@ default_attributes(
       :bretth => {
         :status => :user,
         :shell => "/usr/bin/git-shell"
-      },
+      }
     }
   },
   :apache => {
     :mpm => "event",
     :event => {
-      :max_requests_per_child => 2000
+      :max_connections_per_child => 2000
     }
   },
+  :hardware => {
+    :modules => [
+      "it87"
+    ]
+  },
+  :openvpn => {
+    :address => "10.0.16.3",
+    :tunnels => {
+      :shenron2ucl => {
+        :port => "1194",
+        :mode => "server",
+        :peer => {
+          :host => "ridley.openstreetmap.org"
+        }
+      }
+    }
+  }
+)
+
+override_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -33,18 +53,6 @@ default_attributes(
         :address => "2001:41c9:1:400::32",
         :prefix => "64",
         :gateway => "fe80::1"
-      },
-    }
-  },
-  :openvpn => {
-    :address => "10.0.16.3",
-    :tunnels => {
-      :shenron2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
-        }
       }
     }
   }