X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/743225d946030d146d8a130eb6551e9246d7ada4..5b4f815f6cd8433be1d66b8376b71452f974b225:/cookbooks/tile/templates/default/replicate.erb

diff --git a/cookbooks/tile/templates/default/replicate.erb b/cookbooks/tile/templates/default/replicate.erb
index ecc6b69b0..aa69177ec 100644
--- a/cookbooks/tile/templates/default/replicate.erb
+++ b/cookbooks/tile/templates/default/replicate.erb
@@ -28,7 +28,7 @@ trap onexit EXIT
 while true
 do
     # Work out the name of the next file
-    file="changes-${sequenceNumber}.osm.gz"
+    file="changes-${sequenceNumber}.osc.gz"
 
     # Save state file so we can rollback if an error occurs
     cp state.txt state-prev.txt
@@ -67,11 +67,16 @@ do
             echo "Fetched new data from ${prevSequenceNumber} to ${sequenceNumber} into ${file}"
 
             # Apply the changes to the database
+            osm2pgsql --database gis --slim --append --number-processes=1 \
 <% if node[:tile][:node_file] -%>
-            osm2pgsql --database gis --slim --append --number-processes=1 --flat-nodes=<%= node[:tile][:node_file] %> ${file}
-<% else -%>
-            osm2pgsql --database gis --slim --append --number-processes=1 ${file}
+                      --flat-nodes=<%= node[:tile][:node_file] %> \
 <% end -%>
+<% if node[:tile][:styles][:default][:revision] >= "v4.0.0" -%>
+                      --multi-geometry --hstore \
+                      --style=/srv/tile.openstreetmap.org/styles/default/openstreetmap-carto.style \
+                      --tag-transform-script=/srv/tile.openstreetmap.org/styles/default/openstreetmap-carto.lua \
+<% end -%>
+                      ${file}
 
             # No need to rollback now
             rm state-prev.txt