remote hp-g5 role from draco

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index d6e8ff9c5f5e97670cb791b137598e01c1dd4326..9009c08245aabe597d4c4f1a10caf42ccedaf50a 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -2,14 +2,6 @@ name "shenron"
 description "Master role applied to shenron"
 
 default_attributes(
-  :accounts => {
-    :users => {
-      :bretth => {
-        :status => :user,
-        :shell => "/usr/bin/git-shell"
-      }
-    }
-  },
   :apache => {
     :mpm => "event",
     :event => {
@@ -17,7 +9,13 @@ default_attributes(
       :max_spare_threads => 150
     }
   },
+  :apt => {
+    :sources => ["brightbox-ruby-ng"]
+  },
   :hardware => {
+    :mcelog => {
+      :enabled => false
+    },
     :modules => [
       "it87"
     ]
@@ -63,13 +61,11 @@ 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]"
 )