Block more library defaults from tiles

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index 9323c23cecb51e13fcdf1609aa0c5adcfedcef65..c3db86355878f4cb3b0f1e17c460b59b6daa7007 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -2,25 +2,36 @@ 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

     }
   },
   :hardware => {
     }
   },
   :hardware => {

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

     :modules => [
       "it87"
     ]
   },
     :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 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {


@@ -39,19 +50,8 @@ default_attributes(
         :prefix => "64",
         :gateway => "fe80::1"
       }
         :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"]

   }
 )
 
   }
 )
 


@@ -59,13 +59,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]"
 )