Update chef client to 12.10.24

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index a6d772e43c2859875071026d914ed11ee884ae03..6785c00239216594da7917525fa2e86f1c82ff46 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -22,19 +22,15 @@ default_attributes(
       :threads_per_child => 50
     }
   },
       :threads_per_child => 50
     }
   },

-  :chef => {
-    :client => {
-      :version => "12.1.2-1"
-    }
-  },

   :postgresql => {
     :settings => {
       :defaults => {
         :max_connections => "450",
         :synchronous_commit => "off",
   :postgresql => {
     :settings => {
       :defaults => {
         :max_connections => "450",
         :synchronous_commit => "off",

-        :checkpoint_segments => "50",
+        :checkpoint_segments => "32",

         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",
         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",

+        :shared_buffers => "2GB",

         :autovacuum_max_workers => "1"
       }
     }
         :autovacuum_max_workers => "1"
       }
     }


@@ -74,11 +70,20 @@ default_attributes(
     }
   },
   :nominatim => {
     }
   },
   :nominatim => {

-    :enabled => true,
-    :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]"
-)