X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e3986ef9ac0e02ffbcdcd1bd5c63cf4531fe111b..310c3fa223b5f20f4f8847b4fd8304189585770b:/roles/saphira.rb?ds=sidebyside

diff --git a/roles/saphira.rb b/roles/saphira.rb
index 18574ba28..7da9a0714 100644
--- a/roles/saphira.rb
+++ b/roles/saphira.rb
@@ -2,9 +2,6 @@ name "saphira"
 description "Master role applied to saphira"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "10g"
-  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -24,31 +21,10 @@ default_attributes(
         :gateway => "fe80::fcff:ffff:feff:ffff"
       }
     }
-  },
-  :squid => {
-    :version => 4,
-    :cache_mem => "8192 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"
-    ]
-  },
-  :nginx => {
-    :cache => {
-      :proxy => {
-        :max_size => "16384M"
-      }
-    }
-  },
-  :tilecache => {
-    :tile_parent => "london.render.openstreetmap.org"
   }
 )
 
 run_list(
   "role[jump]",
-  "role[geodns]",
-  "role[tilecache]"
+  "role[geodns]"
 )