X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/edeb17167b2854344c352e1c725085636afd3668..5aa2fa036a5c7b373996b4ad43a1964fa63d43f7:/roles/shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index d5fd177f8..c3db86355 100644
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -2,20 +2,36 @@ name "shenron"
 description "Master role applied to shenron"
 
 default_attributes(
-  :accounts => {
-    :users => {
-      :bretth => {
-        :status => :user,
-        :shell => "/usr/bin/git-shell"
-      },
-    }
-  },
   :apache => {
     :mpm => "event",
     :event => {
-      :max_requests_per_child => 2000
+      :min_spare_threads => 50,
+      :max_spare_threads => 150
     }
   },
+  :hardware => {
+    :mcelog => {
+      :enabled => false
+    },
+    :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,20 +49,9 @@ 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"
-        }
       }
-    }
+    },
+    :nameservers => ["89.16.162.20", "2001:41c9:2:d6::20"]
   }
 )
 
@@ -54,13 +59,10 @@ run_list(
   "role[bytemark]",
   "role[mail]",
   "role[lists]",
-  "role[git]",
   "role[subversion]",
   "role[trac]",
   "role[osqa]",
   "role[irc]",
-  "role[dns]",
-  "role[geodns]",
-  "role[chef-repository]",
+  "recipe[blogs]",
   "recipe[openvpn]"
 )