Upgrade poldi and pummelzacken to chef 12

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index e26882dc66130330885eedb49a4c04d00afb3e91..a6d772e43c2859875071026d914ed11ee884ae03 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -8,8 +8,8 @@ default_attributes(
       :twain => { :status => :administrator },
       :nominatim => {
         :status => :role,
-        :members => [ :lonvia, :tomh, :twain ]
-      },
+        :members => [:lonvia, :tomh, :twain]
+      }
     }
   },
   :apache => {
@@ -22,6 +22,11 @@ default_attributes(
       :threads_per_child => 50
     }
   },
+  :chef => {
+    :client => {
+      :version => "12.1.2-1"
+    }
+  },
   :postgresql => {
     :settings => {
       :defaults => {
@@ -37,7 +42,7 @@ default_attributes(
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
-      :parameters => { 
+      :parameters => {
         "kernel.shmmax" => 26 * 1024 * 1024 * 1024,
         "kernel.shmall" => 26 * 1024 * 1024 * 1024 / 4096
       }
@@ -48,9 +53,28 @@ default_attributes(
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }
+    },
+    :swappiness => {
+      :comment => "Reduce swap usage",
+      :parameters => {
+        "vm.swappiness" => 10
+      }
+    },
+    :network_conntrack_time_wait => {
+      :comment => "Only track completed connections for 30 seconds",
+      :parameters => {
+        "net.netfilter.nf_conntrack_tcp_timeout_time_wait" => "30"
+      }
+    },
+    :network_conntrack_max => {
+      :comment => "Increase max number of connections tracked",
+      :parameters => {
+        "net.netfilter.nf_conntrack_max" => "131072"
+      }
     }
   },
   :nominatim => {
+    :enabled => true,
     :repository => "git://git.openstreetmap.org/nominatim.git"
   }
 )