Merge remote-tracking branch 'github/pull/358' into master

[chef.git] / roles / fuchur.rb

diff --git a/roles/fuchur.rb b/roles/fuchur.rb
index 226e028d73529a8e6b77d9aac47594c79a5c5cdf..559700211e78a2685d4da58be260119faa589af4 100644 (file)
--- a/roles/fuchur.rb
+++ b/roles/fuchur.rb
@@ -3,7 +3,7 @@ description "Master role applied to fuchur"
 
 default_attributes(
   :hardware => {
 
 default_attributes(
   :hardware => {

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

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


@@ -23,11 +23,14 @@ default_attributes(
         :prefix => "123",
         :gateway => "2800:1e0:1020::41"
       }
         :prefix => "123",
         :gateway => "2800:1e0:1020::41"
       }

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

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

-    :cache_mem => "16384 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",


@@ -43,7 +46,7 @@ default_attributes(
     }
   },
   :tilecache => {
     }
   },
   :tilecache => {

-    :tile_parent => "bogota.render.openstreetmap.org"
+    :tile_parent => "brazil.render.openstreetmap.org"

   }
 )
 
   }
 )