Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

[chef.git] / roles / kalessin.rb

diff --git a/roles/kalessin.rb b/roles/kalessin.rb
index 71128225476b2c5c59ebbe27d24feaee7fb0a18b..1a094e65e4e8b8b4a186b401680323d420bf769e 100644 (file)
--- a/roles/kalessin.rb
+++ b/roles/kalessin.rb
@@ -2,10 +2,13 @@ name "kalessin"
 description "Master role applied to kalessin"
 
 default_attributes(
 description "Master role applied to kalessin"
 
 default_attributes(

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

   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {

-        :interface => "eth0",
+        :interface => "ens3",

         :role => :external,
         :family => :inet,
         :address => "185.66.195.245",
         :role => :external,
         :family => :inet,
         :address => "185.66.195.245",


@@ -13,7 +16,7 @@ default_attributes(
         :gateway => "185.66.195.241"
       },
       :external_ipv6 => {
         :gateway => "185.66.195.241"
       },
       :external_ipv6 => {

-        :interface => "eth0",
+        :interface => "ens3",

         :role => :external,
         :family => :inet6,
         :address => "2a03:2260:2000:1::5",
         :role => :external,
         :family => :inet6,
         :address => "2a03:2260:2000:1::5",


@@ -23,24 +26,29 @@ 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 => "16384 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"
+    ]
+  },
+  :nginx => {
+    :cache => {
+      :proxy => {
+        :keys_zone => "proxy_cache_zone:64M",
+        :max_size => "2048M"
+      }
+    }

   },
   :tilecache => {
   },
   :tilecache => {

-    :tile_parent => "germany.render.openstreetmap.org",
-    :tile_siblings => [
-      "konqi.openstreetmap.org",
-      "trogdor.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org",
-      "simurgh.openstreetmap.org"
-    ]
+    :tile_parent => "germany.render.openstreetmap.org"

   }
 )
 
 run_list(
   "role[ffrl]",
   }
 )
 
 run_list(
   "role[ffrl]",

-  "role[geodns]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )