add flatnode file and tablespace configurations for nominatim

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 2f1f7463ae6b8282433683e00be419d175af2a2d..df12978450b9fbd01cc3476091f45972ee2050f4 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -261,3 +261,10 @@ template "/usr/local/bin/backup-nominatim" do
   mode 0755
 end
 
   mode 0755
 end
 

+directory File.dirname(node[:nominatim][:flatnode_file]) do
+  owner "nominatim"
+  group "nominatim"
+  mode 0755
+  recursive true
+end
+

diff --git a/cookbooks/nominatim/templates/default/nominatim.erb b/cookbooks/nominatim/templates/default/nominatim.erb
index 2aa56437fbc12a7c9ee826fc4634e29182e4107d..57821994c687296e7220ba52643176ea59c65e58 100644 (file)
--- a/cookbooks/nominatim/templates/default/nominatim.erb
+++ b/cookbooks/nominatim/templates/default/nominatim.erb
@@ -10,5 +10,11 @@ else
 @define('CONST_Postgresql_Version', '<%= @postgres_version %>');
 @define('CONST_Postgis_Version', '<%= node[:nominatim][:database][:postgis] %>');
 
 @define('CONST_Postgresql_Version', '<%= @postgres_version %>');
 @define('CONST_Postgis_Version', '<%= node[:nominatim][:database][:postgis] %>');
 

+@define('CONST_Osm2pgsql_Flatnode_File', '<%= node[:nominatim][:flatnode_file] %>');
+
+<% node[:nominatim][:tablespaces].each do |part,name| -%>
+@define('CONST_Tablespace_<%= part %>', '<%= name %>');
+<% end -%>
+

 @define('CONST_Log_File', '/var/log/nominatim/query.log');
 @define('CONST_Log_DB', false);
 @define('CONST_Log_File', '/var/log/nominatim/query.log');
 @define('CONST_Log_DB', false);

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index a98fd9f25a349ab3975e279a3a0922ec98bb7f99..5ab2429973313a24de589b16d2bd809a2586084f 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -58,7 +58,19 @@ default_attributes(
   },
   :nominatim => {
     :enabled => true,
   },
   :nominatim => {
     :enabled => true,

-    :repository => "git://git.openstreetmap.org/nominatim.git"
+    :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",
+    }

   }
 )
 
   }
 )
 

diff --git a/roles/poldi.rb b/roles/poldi.rb
index 57fe00e521a99a5889075e5433a4abec6a69825b..f9215719a6a581ceeae149ad42fdfebb1b3cac13 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -64,6 +64,7 @@ default_attributes(
   },
   :nominatim => {
     :enabled => false,
   },
   :nominatim => {
     :enabled => false,

+    :flatnode_file => "/ssd-old/nominatim/nodes.store",

     :database => {
         :cluster => "9.3/main",
         :dbname => "nominatim",
     :database => {
         :cluster => "9.3/main",
         :dbname => "nominatim",

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index ec99539cd6cd868be9ef44822924faf201afd060..c63696e1dfcd8e67effa9b451a9b41e76b0701d0 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -33,6 +33,7 @@ default_attributes(
   },
   :nominatim => {
     :enabled => true,
   },
   :nominatim => {
     :enabled => true,

+    :flatnode_file => "/ssd/nominatim/nodes.store",

     :database => {
         :cluster => "9.3/main",
         :dbname => "nominatim",
     :database => {
         :cluster => "9.3/main",
         :dbname => "nominatim",