Merge remote-tracking branch 'github/pull/388'

[chef.git] / roles / viserion.rb

diff --git a/roles/viserion.rb b/roles/viserion.rb
index d945ef790bb0bfe777d28e2c6eb651b52c84caf2..03bbc3c05055f8b91036a33c0d3ecf9249856720 100644 (file)
--- a/roles/viserion.rb
+++ b/roles/viserion.rb
@@ -7,6 +7,9 @@ default_attributes(
       :anovak => { :status => :administrator }
     }
   },
       :anovak => { :status => :administrator }
     }
   },

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

   :location => "Pula, Croatia",
   :munin => {
     :allow => ["193.198.233.210"]
   :location => "Pula, Croatia",
   :munin => {
     :allow => ["193.198.233.210"]


@@ -29,23 +32,20 @@ default_attributes(
         :prefix => "64",
         :gateway => "2001:b68:4cff:3::1"
       }
         :prefix => "64",
         :gateway => "2001:b68:4cff:3::1"
       }

-    },
-    :nameservers => [
-      "8.8.8.8",
-      "8.8.4.4",
-      "2001:4860:4860::8888",
-      "2001:4860:4860::8844"
-    ]
+    }

   },
   :squid => {
   },
   :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 => {
   },
   :tilecache => {

-    :tile_parent => "pula.render.openstreetmap.org",
-    :tile_siblings => [
-      "drogon.openstreetmap.org"
-    ]
+    :tile_parent => "pula.render.openstreetmap.org"

   }
 )
 
   }
 )