Update piwik to 4.6.2

[chef.git] / roles / trogdor.rb

diff --git a/roles/trogdor.rb b/roles/trogdor.rb
index 7e0c601cfb5412bbb9a04be1e1aa1cd701a67f73..cfa86b2b29d2108c6ec1aa4e6c063ad6e6e84dc7 100644 (file)
--- a/roles/trogdor.rb
+++ b/roles/trogdor.rb
@@ -2,9 +2,6 @@ name "trogdor"
 description "Master role applied to trogdor"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "14g"
-  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -27,30 +24,9 @@ default_attributes(
         "block/md1/md/sync_speed_max" => "100000"
       }
     }
-  },
-  :squid => {
-    :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"
-    ]
-  },
-  :nginx => {
-    :cache => {
-      :proxy => {
-        :max_size => "131072M"
-      }
-    }
-  },
-  :tilecache => {
-    :tile_parent => "netherlands.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[blix-nl]",
-  "role[tilecache]"
+  "role[blix-nl]"
 )