X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c8b97939a36d0f5873cb2975455aae4d0e8287be..96096e070a9d9bb0dfdbcd2c939ef0ffd65273c1:/roles/viserion.rb?ds=sidebyside

diff --git a/roles/viserion.rb b/roles/viserion.rb
index 0691db49a..03bbc3c05 100644
--- a/roles/viserion.rb
+++ b/roles/viserion.rb
@@ -2,6 +2,18 @@ name "viserion"
 description "Master role applied to viserion"
 
 default_attributes(
+  :accounts => {
+    :users => {
+      :anovak => { :status => :administrator }
+    }
+  },
+  :hardware => {
+    :shm_size => "36g"
+  },
+  :location => "Pula, Croatia",
+  :munin => {
+    :allow => ["193.198.233.210"]
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -9,7 +21,7 @@ default_attributes(
         :role => :external,
         :family => :inet,
         :address => "193.198.233.211",
-        :prefix => "27",
+        :prefix => "29",
         :gateway => "193.198.233.209"
       },
       :external_ipv6 => {
@@ -17,22 +29,27 @@ default_attributes(
         :role => :external,
         :family => :inet6,
         :address => "2001:b68:4cff:3::3",
-        :prefix => "128",
-        :gateway => "fe80::217:fff:fead:14c0"
+        :prefix => "64",
+        :gateway => "2001:b68:4cff:3::1"
       }
     }
   },
   :squid => {
-    :cache_mem => "12500 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"
+    ]
   },
   :tilecache => {
-    :tile_parent => "pula.render.openstreetmap.org",
-    :tile_siblings => [
-    ]
+    :tile_parent => "pula.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[carnet]"
+  "role[carnet]",
+  "role[tilecache]"
 )