Merge remote-tracking branch 'github/pull/579'

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index e276121698c30c38e082b0cfd643e0b1dc67f3eb..56e2a3ed3afa845f0fbb727c8e3b5a8c0fb18f43 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -2,21 +2,28 @@ 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 => {
+    :hwmon => {
+      "platform_it87_552" => {
+        :ignore => %w[in6]
+      }
+    },
+    :modules => [
+      "it87"
+    ]
+  }
+)
+
+override_attributes(
   :networking => {
+    :dnssec => "false",
     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",
@@ -30,21 +37,9 @@ default_attributes(
         :interface => "eth0",
         :role => :external,
         :family => :inet6,
-        :address => "2001:41c8:0010:0996:21d:7dff:fec3:df70",
+        :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"
-        }
       }
     }
   }
@@ -52,15 +47,6 @@ default_attributes(
 
 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[openvpn]"
+  "role[osqa]"
 )