Merge remote-tracking branch 'github/pull/699'

diff --git a/cookbooks/vectortile/recipes/default.rb b/cookbooks/vectortile/recipes/default.rb
index 6fcf2531749ec5f8b2364777d181c67f4e17b126..39c54e5ddd3056599313a2ceb66c01e019797153 100644 (file)
--- a/cookbooks/vectortile/recipes/default.rb
+++ b/cookbooks/vectortile/recipes/default.rb
@@ -222,7 +222,7 @@ systemd_service "tilekiln" do
   wants "postgresql.service"
   sandbox :enable_network => true
   restrict_address_families "AF_UNIX"
-  exec_start "#{tilekiln_directory}/bin/tilekiln serve #{tilekiln_mode} --storage-dbname tiles --num-threads #{node[:vectortile][:serve][:threads]}"
+  exec_start "#{tilekiln_directory}/bin/tilekiln serve #{tilekiln_mode} --storage-dbname tiles --num-threads #{node[:vectortile][:serve][:threads]} --base-url 'https://vector.openstreetmap.org'"
 end
 
 service "tilekiln" do

diff --git a/test/integration/vectortile/inspec/tilekiln_spec.rb b/test/integration/vectortile/inspec/tilekiln_spec.rb
index 2887571db57814428c3ae5b11a201105d4fec6a9..d44562d4c667536558dd0d7878934c3964840c7b 100644 (file)
--- a/test/integration/vectortile/inspec/tilekiln_spec.rb
+++ b/test/integration/vectortile/inspec/tilekiln_spec.rb
@@ -21,6 +21,10 @@ describe http("https://localhost/shortbread_v1/tilejson.json", :ssl_verify => fa
   its("status") { should cmp 200 }
 end
 
+describe json(:content => http("https://localhost/shortbread_v1/tilejson.json", :ssl_verify => false)) do
+  its(["tiles"]) { should eq(["https://vector.openstreetmap.org/shortbread_v1/{z}/{x}/{y}.mvt"]) }
+end
+
 # There are no tiles so everything should return a 404
 describe http("https://localhost/shortbread_v1/0/0/0.mvt", :ssl_verify => false) do
   its("status") { should cmp 404 }