use a common tablespace layout for all nominatim servers

... or replication between servers will not work.

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index bf509dddecf4da211f6f31327ed28f8351c5f2f7..86a2fe9cd23552bcf98081c71e3d45009ac39fc1 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -70,7 +70,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" => "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"
+    }

   }
 )
 
   }
 )
 

diff --git a/roles/poldi.rb b/roles/poldi.rb
index 52b32e7e925aa40c24aed715ecaaa796904f6994..e121bf345d678275ca1ab09344c3d48bdf69d44e 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -88,18 +88,6 @@ default_attributes(
         :pm => "static",
         :max_children => "10"
       }
         :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 00ecfe5e534674b47c23c0c6a975831ad61368a9..eeaadfce9bb32bd237924fdec5f6135ee86967c3 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -50,18 +50,6 @@ default_attributes(
         :pm => "static",
         :max_children => "10"
       }
         :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" => "ssd"

     }
   }
 )
     }
   }
 )