vectortile: make enabled a boolean

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

diff --git a/cookbooks/vectortile/recipes/default.rb b/cookbooks/vectortile/recipes/default.rb
index 1015b38e2b9bd97fe753efb30434dde871352f16..feda712a0ba3f0599b35b5ca4adad035eab64463 100644 (file)
--- a/cookbooks/vectortile/recipes/default.rb
+++ b/cookbooks/vectortile/recipes/default.rb
@@ -86,6 +86,7 @@ shortbread_config = "#{style_directory}/shortbread.yaml"
 themepark_directory = "/srv/vector.openstreetmap.org/osm2pgsql-themepark"
 git themepark_directory do
   repository "https://github.com/osm2pgsql-dev/osm2pgsql-themepark.git"
+  revision "444bfbda82dea2899e77ac7f0e88ddf7f62c3b45"
   user "tileupdate"
   group "tileupdate"
 end
@@ -99,7 +100,7 @@ end
 python_package "tilekiln" do
   python_virtualenv tilekiln_directory
   python_version "3"
-  version "0.6.5"
+  version node[:vectortile][:tilekiln][:version]
 end
 
 template "/srv/vector.openstreetmap.org/html/index.html" do
@@ -245,11 +246,11 @@ execute "/srv/vector.openstreetmap.org/spirit/scripts/get-external-data.py" do
 end
 
 template "/usr/local/bin/vector-update" do
-  source node[:vectortile][:replication][:tileupdate] == :enabled ? "vector-update-tile.erb" : "vector-update-notile.erb"
+  source node[:vectortile][:replication][:tileupdate] ? "vector-update-tile.erb" : "vector-update-notile.erb"
   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
@@ -257,7 +258,7 @@ template "/usr/local/bin/tiles-rerender" do
   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
@@ -278,7 +279,7 @@ systemd_timer "replicate" do
   accuracy_sec 5
 end
 
-if node[:vectortile][:replication][:status] == :enabled
+if node[:vectortile][:replication][:enabled]
   service "replicate.timer" do
     action [:enable, :start]
   end