From a194131b6ac8c700e2bdc10c2014b3b49bd876ac Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 19 Dec 2014 22:54:46 +0100
Subject: [PATCH] add flatnode file and tablespace configurations for nominatim

---
 cookbooks/nominatim/recipes/default.rb             |  7 +++++++
 .../nominatim/templates/default/nominatim.erb      |  6 ++++++
 roles/nominatim.rb                                 | 14 +++++++++++++-
 roles/poldi.rb                                     |  1 +
 roles/pummelzacken.rb                              |  1 +
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 2f1f7463a..df1297845 100644
--- 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
 
+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 2aa56437f..57821994c 100644
--- 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_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);
diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index a98fd9f25..5ab242997 100644
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -58,7 +58,19 @@ default_attributes(
   },
   :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 57fe00e52..f9215719a 100644
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -64,6 +64,7 @@ default_attributes(
   },
   :nominatim => {
     :enabled => false,
+    :flatnode_file => "/ssd-old/nominatim/nodes.store",
     :database => {
         :cluster => "9.3/main",
         :dbname => "nominatim",
diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index ec99539cd..c63696e1d 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -33,6 +33,7 @@ default_attributes(
   },
   :nominatim => {
     :enabled => true,
+    :flatnode_file => "/ssd/nominatim/nodes.store",
     :database => {
         :cluster => "9.3/main",
         :dbname => "nominatim",
-- 
2.43.2