Update chef client to 12.10.24

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index c884e2b21b37a0a0fe92c5debf99813822a65ff4..6785c00239216594da7917525fa2e86f1c82ff46 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,17 +22,15 @@ default_attributes(
       :threads_per_child => 50
     }
   },
-  :apt => {
-    :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
-  },
   :postgresql => {
     :settings => {
       :defaults => {
         :max_connections => "450",
         :synchronous_commit => "off",
-        :checkpoint_segments => "50",
+        :checkpoint_segments => "32",
         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",
+        :shared_buffers => "2GB",
         :autovacuum_max_workers => "1"
       }
     }
@@ -40,7 +38,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,13 +49,41 @@ 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 => {
-    :repository => "git://git.openstreetmap.org/nominatim.git"
+    :enabled => false,
+    :repository => "git://git.openstreetmap.org/nominatim.git",
+    :tablespaces => {
+      "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"
+    },
+    :redirects => {}
   }
 )
-
-run_list(
-  "recipe[nominatim]"
-)