pummelzacken: increase fpm-pool size

[chef.git] / roles / stormfly-02.rb

diff --git a/roles/stormfly-02.rb b/roles/stormfly-02.rb
index 9e97b4a674d23fb798aa47f876216b6498c0710d..25cce34ae4e02fa0394374e6d691cd698e645164 100644 (file)
--- a/roles/stormfly-02.rb
+++ b/roles/stormfly-02.rb
@@ -2,6 +2,9 @@ name "stormfly-02"
 description "Master role applied to stormfly-02"
 
 default_attributes(
 description "Master role applied to stormfly-02"
 
 default_attributes(

+  :hardware => {
+    :shm_size => "38g"
+  },

   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {


@@ -9,27 +12,40 @@ default_attributes(
         :role => :external,
         :family => :inet,
         :address => "140.211.167.105"
         :role => :external,
         :family => :inet,
         :address => "140.211.167.105"

+      },
+      :external_ipv6 => {
+        :interface => "em1",
+        :role => :external,
+        :family => :inet6,
+        :address => "2605:bc80:3010:700::8cde:a769"

       }
     }
   },
   :squid => {
       }
     }
   },
   :squid => {

-    :cache_mem => "32000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "32768 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
+  },
+  :nginx => {
+    :cache => {
+      :proxy => {
+        :max_size => "65536M"
+      }
+    }

   },
   :tilecache => {
   },
   :tilecache => {

-    :tile_parent => "corvallis.render.openstreetmap.org",
-    :tile_siblings => [
-      "nadder-01.openstreetmap.org",
-      "nadder-02.openstreetmap.org",
-      "jakelong.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "lurien.openstreetmap.org"
-    ]
+    :tile_parent => "corvallis.render.openstreetmap.org"

   }
 )
 
 run_list(
   "role[osuosl]",
   }
 )
 
 run_list(
   "role[osuosl]",

-  "role[hp-g6]",
+  "role[hp-dl360-g6]",
+  "role[geodns]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )