move nominatim tablespace configuration to server roles

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index e6afd469fb6593b944e1920657c81ed9ad37715a..f0f2a2dc39edac3fb601e8001c48e536611d8b6a 100644 (file)
--- 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 e9961cafa699aa8147a686e69ebb1d5ac5ed4c1a..cc6a278e49e4af554f0a09a343ca7729c77cbb35 100644 (file)
--- 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 c63696e1dfcd8e67effa9b451a9b41e76b0701d0..d69d5c64432c27d8ebbb2a5ddadbe9085affb549 100644 (file)
--- 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",
     }
   }
 )