Fix more rubocop detected style issues

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index c884e2b21b37a0a0fe92c5debf99813822a65ff4..dff1acca745ddde2df3c147fd84197d5ea8f28b0 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -9,7 +9,7 @@ default_attributes(
       :nominatim => {
         :status => :role,
         :members => [ :lonvia, :tomh, :twain ]
-      },
+      }
     }
   },
   :apache => {
@@ -22,9 +22,6 @@ default_attributes(
       :threads_per_child => 50
     }
   },
-  :apt => {
-    :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
-  },
   :postgresql => {
     :settings => {
       :defaults => {
@@ -40,7 +37,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
       }
@@ -51,9 +48,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"
   }
 )