From e47ce8c5fb7b456fcf36a6d6253a71e1da9fa729 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 22 Jan 2015 00:23:31 +0100
Subject: [PATCH] move nominatim tablespace configuration to server roles

---
 roles/nominatim.rb    | 14 +-------------
 roles/poldi.rb        | 12 ++++++++++++
 roles/pummelzacken.rb | 12 ++++++++++++
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index e6afd469f..f0f2a2dc3 100644
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -70,19 +70,7 @@ default_attributes(
   },
   :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",
-    }
+    :repository => "git://git.openstreetmap.org/nominatim.git"
   }
 )
 
diff --git a/roles/poldi.rb b/roles/poldi.rb
index e9961cafa..cc6a278e4 100644
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -82,6 +82,18 @@ default_attributes(
             :pm => "static",
             :max_children => "10"
         }
+    },
+    :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/pummelzacken.rb b/roles/pummelzacken.rb
index c63696e1d..d69d5c644 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -50,6 +50,18 @@ default_attributes(
             :pm => "static",
             :max_children => "10"
         }
+    },
+    :tablespaces => {
+        "Osm2pgsql_Data" => "ssd",
+        "Osm2pgsql_Index" => "ssd",
+        "Place_Data" => "ssd",
+        "Place_Index" => "ssd",
+        "Address_Data" => "ssd",
+        "Address_Index" => "ssd",
+        "Search_Data" => "ssd",
+        "Search_Index" => "ssd",
+        "Aux_Data" => "data",
+        "Aux_Index" => "data",
     }
   }
 )
-- 
2.39.5