Update wiki to mediawiki 1.37

[chef.git] / roles / viserion.rb

diff --git a/roles/viserion.rb b/roles/viserion.rb
index 03bbc3c05055f8b91036a33c0d3ecf9249856720..a951929020dd9fddc68178d7182afdf5c1739264 100644 (file)
--- a/roles/viserion.rb
+++ b/roles/viserion.rb
@@ -7,9 +7,6 @@ default_attributes(
       :anovak => { :status => :administrator }
     }
   },
-  :hardware => {
-    :shm_size => "36g"
-  },
   :location => "Pula, Croatia",
   :munin => {
     :allow => ["193.198.233.210"]
@@ -33,23 +30,9 @@ default_attributes(
         :gateway => "2001:b68:4cff:3::1"
       }
     }
-  },
-  :squid => {
-    :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"
-    ]
-  },
-  :tilecache => {
-    :tile_parent => "pula.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[carnet]",
-  "role[tilecache]"
+  "role[carnet]"
 )