Bump cookstyle from 6.19.11 to 6.20.1

[chef.git] / roles / rimfaxe.rb

diff --git a/roles/rimfaxe.rb b/roles/rimfaxe.rb
index bf06a94bc941484163bcd765097ca10ec1f74118..f130d03e4d73195bb2baaf39d3d227d0af04eb41 100644 (file)
--- a/roles/rimfaxe.rb
+++ b/roles/rimfaxe.rb
@@ -3,7 +3,7 @@ description "Master role applied to rimfaxe"
 
 default_attributes(
   :hardware => {
 
 default_attributes(
   :hardware => {

-    :shm_size => "12g"
+    :shm_size => "10g"

   },
   :networking => {
     :interfaces => {
   },
   :networking => {
     :interfaces => {


@@ -23,11 +23,14 @@ default_attributes(
         :prefix => "64",
         :gateway => "2001:878:346::97"
       }
         :prefix => "64",
         :gateway => "2001:878:346::97"
       }

+    },
+    :wireguard => {
+      :enabled => false

     }
   },
   :squid => {
     :version => 4,
     }
   },
   :squid => {
     :version => 4,

-    :cache_mem => "10240 MB",
+    :cache_mem => "8192 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",
     :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",


@@ -36,13 +39,7 @@ default_attributes(
     ]
   },
   :tilecache => {
     ]
   },
   :tilecache => {

-    :tile_parent => "aalborg.render.openstreetmap.org",
-    :tile_siblings => [
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]
+    :tile_parent => "aalborg.render.openstreetmap.org"

   }
 )
 
   }
 )