Really set a limit on expiring long way segments

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index aec9e1b81c39eab583279d93e46716bd2f9b037b..eab19d75dec8b81fc41d70879b06363f870c2377 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -577,18 +577,6 @@ template "/usr/local/bin/replicate-post" do
   mode "755"
 end
 
-osm2pgsql_arguments = %w[
-    --number-processes=1
-    --log-progress=false
-    --expire-tiles=13-19
-    --expire-segment-length=90000
-    --expire-output=/var/lib/replicate/dirty-tiles.txt
-  ]
-
-osm2pgsql_arguments.append("--multi-geometry") if node[:tile][:database][:multi_geometry]
-osm2pgsql_arguments.append("--hstore") if node[:tile][:database][:hstore]
-osm2pgsql_arguments.append("--tag-transform-script=#{node[:tile][:database][:tag_transform_script]}") if node[:tile][:database][:tag_transform_script]
-
 systemd_service "replicate" do
   description "Rendering database replication service"
   after "postgresql.service"

diff --git a/cookbooks/tile/templates/default/replicate.erb b/cookbooks/tile/templates/default/replicate.erb
index 88917dff29cd2f99f2833ead15cbe4afa70a322b..f0fa899612f644377964425ede279fa20cc9a5b1 100644 (file)
--- a/cookbooks/tile/templates/default/replicate.erb
+++ b/cookbooks/tile/templates/default/replicate.erb
@@ -11,6 +11,7 @@ do
     --number-processes=1 \
     --log-progress=false \
     --expire-tiles=13-19 \
+    --expire-segment-length=90000 \
     --expire-output=/var/lib/replicate/dirty-tiles.txt \
 <% if node[:tile][:database][:multi_geometry] -%>
     --multi-geometry \