Make maswan an admin on umu machines

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index 84a38aa064586d3e115f56522876383085600fe2..ce00c01c469ca8c7f3127aa26cdcf8ade7fd0931 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -2,21 +2,20 @@ name "shenron"
 description "Master role applied to shenron"
 
 default_attributes(
 description "Master role applied to shenron"
 
 default_attributes(

-  :accounts => {
-    :users => {
-      :bretth => {
-        :status => :user,
-        :shell => "/usr/bin/git-shell"
-      }
-    }
-  },

   :apache => {
     :mpm => "event",
     :event => {
   :apache => {
     :mpm => "event",
     :event => {

-      :max_connections_per_child => 2000
+      :min_spare_threads => 50,
+      :max_spare_threads => 150

     }
   },
     }
   },

+  :apt => {
+    :sources => ["brightbox-ruby-ng"]
+  },

   :hardware => {
   :hardware => {

+    :mcelog => {
+      :enabled => false
+    },

     :modules => [
       "it87"
     ]
     :modules => [
       "it87"
     ]


@@ -62,13 +61,10 @@ run_list(
   "role[bytemark]",
   "role[mail]",
   "role[lists]",
   "role[bytemark]",
   "role[mail]",
   "role[lists]",

-  "role[git]",

   "role[subversion]",
   "role[trac]",
   "role[osqa]",
   "role[irc]",
   "role[subversion]",
   "role[trac]",
   "role[osqa]",
   "role[irc]",

-  "role[dns]",
-  "role[geodns]",
-  "role[chef-repository]",
+  "recipe[blogs]",

   "recipe[openvpn]"
 )
   "recipe[openvpn]"
 )