Only force the prefork mpm when mod_php is used

[chef.git] / roles / culebre.rb

diff --git a/roles/culebre.rb b/roles/culebre.rb
index 56f6afc4ec0232080ff8223f9f1158611f914b73..ed3d93ddb780defb38d8f4aabfd60e780d1524c5 100644 (file)
--- a/roles/culebre.rb
+++ b/roles/culebre.rb
@@ -2,6 +2,9 @@ name "culebre"
 description "Master role applied to culebre"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "18g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -11,30 +14,21 @@ default_attributes(
         :address => "155.210.4.103",
         :prefix => "28",
         :gateway => "155.210.4.110"
-      },
-      :internal_ipv4 => {
-        :interface => "ens4",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.148.97.151",
-        :prefix => "24"
       }
     }
   },
   :squid => {
-    :version => "3",
-    :cache_mem => "6100 MB",
-    :cache_dir => "rock /store/squid/rock-01 80000 swap-timeout=500 max-swap-rate=150 slot-size=4096 max-size=262144"
+    :version => 4,
+    :cache_mem => "16384 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 12800 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 16000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 22400 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 22800 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
   },
   :tilecache => {
-    :tile_parent => "zaragoza.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]
+    :tile_parent => "zaragoza.render.openstreetmap.org"
   }
 )