Ubuntu MOTD adverts-be-gone

[chef.git] / roles / nepomuk.rb

diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb
index 1240179c225c9dabd7a052debf375282e82a5d30..12277629d091abbc4b77c474d39785fef5916c64 100644 (file)
--- a/roles/nepomuk.rb
+++ b/roles/nepomuk.rb
@@ -2,6 +2,9 @@ name "nepomuk"
 description "Master role applied to nepomuk"
 
 default_attributes(
 description "Master role applied to nepomuk"
 
 default_attributes(

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

   :networking => {
     :firewall => {
       :inet => [
   :networking => {
     :firewall => {
       :inet => [


@@ -46,8 +49,14 @@ default_attributes(
     }
   },
   :squid => {
     }
   },
   :squid => {

-    :cache_mem => "7500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "10240 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"
+    ]

   },
   :sysfs => {
     :hdd_tune => {
   },
   :sysfs => {
     :hdd_tune => {


@@ -58,16 +67,7 @@ default_attributes(
     }
   },
   :tilecache => {
     }
   },
   :tilecache => {

-    :tile_parent => "france.render.openstreetmap.org",
-    :tile_siblings => [
-      # "necrosan.openstreetmap.org", # IO Overloaded
-      # "nepomuk.openstreetmap.org",
-      "noomoahk.openstreetmap.org",
-      "norbert.openstreetmap.org",
-      "ladon.openstreetmap.org",
-      "culebre.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]
+    :tile_parent => "france.render.openstreetmap.org"

   }
 )
 
   }
 )