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

[chef.git] / roles / viserion.rb

diff --git a/roles/viserion.rb b/roles/viserion.rb
index 30297d3857116b9ad08ce5c86a64946ae35db50f..03bbc3c05055f8b91036a33c0d3ecf9249856720 100644 (file)
--- a/roles/viserion.rb
+++ b/roles/viserion.rb
@@ -2,6 +2,18 @@ name "viserion"
 description "Master role applied to viserion"
 
 default_attributes(
 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 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {


@@ -9,7 +21,7 @@ default_attributes(
         :role => :external,
         :family => :inet,
         :address => "193.198.233.211",
         :role => :external,
         :family => :inet,
         :address => "193.198.233.211",

-        :prefix => "27",
+        :prefix => "29",

         :gateway => "193.198.233.209"
       },
       :external_ipv6 => {
         :gateway => "193.198.233.209"
       },
       :external_ipv6 => {


@@ -23,16 +35,21 @@ default_attributes(
     }
   },
   :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 => [
-    ]
+    :tile_parent => "pula.render.openstreetmap.org"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[carnet]"
+  "role[carnet]",
+  "role[tilecache]"

 )
 )