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

[chef.git] / roles / idris.rb

diff --git a/roles/idris.rb b/roles/idris.rb
index f25b3246a5c093bcfa58ba49a0b5f9bbb65a65ea..4308c95ab269670a0824565ddc52b273e2cb3448 100644 (file)
--- a/roles/idris.rb
+++ b/roles/idris.rb
@@ -2,44 +2,56 @@ name "idris"
 description "Master role applied to idris"
 
 default_attributes(
 description "Master role applied to idris"
 
 default_attributes(

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

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

-      :internal_ipv4 => {
-        :interface => "eth0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.4"
-      },

       :external_ipv4 => {
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "ens160",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "128.40.168.98"
+        :address => "200.25.60.197",
+        :prefix => "27",
+        :gateway => "200.25.60.193"
+      },
+      :external_ipv6 => {
+        :interface => "ens160",
+        :role => :external,
+        :family => :inet6,
+        :address => "2800:1e0:1030::64",
+        :prefix => "123",
+        :gateway => "2800:1e0:1030::61"

       }
       }

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

     }
   },
     }
   },

-  :postgresql => {
-    :versions => [ "9.1" ],
-    :settings => {
-      :defaults => {
-        :shared_buffers => "1GB",
-        :maintenance_work_mem => "256MB",
-        :effective_cache_size => "2GB"
-      }
-    }
+  :squid => {
+    :version => 4,
+    :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",
+      "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"
+    ],
+    :private_devices => false

   },
   },

-  :sysctl => {
-    :postgres => {
-      :comment => "Increase shared memory for postgres",
-      :parameters => { 
-        "kernel.shmmax" => 4 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 4 * 1024 * 1024 * 1024 / 4096
+  :nginx => {
+    :cache => {
+      :proxy => {
+        :max_size => "8192M"

       }
     }
       }
     }

+  },
+  :tilecache => {
+    :tile_parent => "buenosaires.render.openstreetmap.org"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl-internal]",
-  "role[tile]"
+  "role[edgeuno-ar]",
+  "role[tilecache]"

 )
 )