Update YAML.safe_load arguments in replicate-changesets

[chef.git] / cookbooks / vectortile / recipes / default.rb

diff --git a/cookbooks/vectortile/recipes/default.rb b/cookbooks/vectortile/recipes/default.rb
index 48b60f3c80bb1add7c8b89938a528c533f103813..a8a78044c18fa72e3375f3a0bb4c35b8aac04012 100644 (file)
--- a/cookbooks/vectortile/recipes/default.rb
+++ b/cookbooks/vectortile/recipes/default.rb
@@ -250,7 +250,7 @@ template "/usr/local/bin/vector-update" do
   owner "root"
   group "root"
   mode "755"
   owner "root"
   group "root"
   mode "755"

-  variables :tilekiln_bin => "#{tilekiln_directory}/bin/tilekiln", :source_database => "spirit", :config_path => "#{shortbread_config}", :diff_size => "1000", :tiles_file => "/srv/vector.openstreetmap.org/data/tiles.txt", :post_processing => "/usr/local/bin/tiles-rerender"
+  variables :tilekiln_bin => "#{tilekiln_directory}/bin/tilekiln", :source_database => "spirit", :config_path => "#{shortbread_config}", :diff_size => "1000", :expiry_dir => "/srv/vector.openstreetmap.org/data/", :post_processing => "/usr/local/bin/tiles-rerender"

 end
 
 template "/usr/local/bin/tiles-rerender" do
 end
 
 template "/usr/local/bin/tiles-rerender" do


@@ -258,7 +258,7 @@ template "/usr/local/bin/tiles-rerender" do
   owner "root"
   group "root"
   mode "755"
   owner "root"
   group "root"
   mode "755"

-  variables :tilekiln_bin => "#{tilekiln_directory}/bin/tilekiln", :source_database => "spirit", :storage_database => "tiles", :config_path => "#{shortbread_config}", :tiles_file => "/srv/vector.openstreetmap.org/data/tiles.txt", :update_threads => 4
+  variables :tilekiln_bin => "#{tilekiln_directory}/bin/tilekiln", :source_database => "spirit", :storage_database => "tiles", :config_path => "#{shortbread_config}", :expiry_dir => "/srv/vector.openstreetmap.org/data/", :update_threads => 4

 end
 
 systemd_service "replicate" do
 end
 
 systemd_service "replicate" do