use a common tablespace layout for all nominatim servers

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 5ab2429973313a24de589b16d2bd809a2586084f..86a2fe9cd23552bcf98081c71e3d45009ac39fc1 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 => {
@@ -37,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
       }
@@ -54,22 +54,34 @@ default_attributes(
       :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",
     :tablespaces => {
-        "Osm2pgsql_Data" => "aux",
-        "Osm2pgsql_Index" => "data",
-        "Place_Data" => "ssd2",
-        "Place_Index" => "ssd1",
-        "Address_Data" => "ssd2",
-        "Address_Index" => "ssd1",
-        "Search_Data" => "ssd1",
-        "Search_Index" => "ssd1",
-        "Aux_Data" => "aux",
-        "Aux_Index" => "aux",
+      "Osm2pgsql_Data" => "data",
+      "Osm2pgsql_Index" => "data",
+      "Place_Data" => "data",
+      "Place_Index" => "ssd2",
+      "Address_Data" => "data",
+      "Address_Index" => "ssd2",
+      "Search_Data" => "ssd1",
+      "Search_Index" => "ssd1",
+      "Aux_Data" => "aux",
+      "Aux_Index" => "aux"
     }
   }
 )