X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/aa68888fba6a7f4ac357855d92db58cc91b902dc..0c82d0842e77184f2080f0d2bae5ab343c55ca54:/cookbooks/tilecache/templates/default/tilecache-curl-time.erb?ds=sidebyside diff --git a/cookbooks/tilecache/templates/default/tilecache-curl-time.erb b/cookbooks/tilecache/templates/default/tilecache-curl-time.erb index 9641d7e41..0c4f53268 100644 --- a/cookbooks/tilecache/templates/default/tilecache-curl-time.erb +++ b/cookbooks/tilecache/templates/default/tilecache-curl-time.erb @@ -1,12 +1,26 @@ #!/bin/bash mkdir -p /srv/tilecache/data/$(date --utc "+%Y/%m") +# localhost +curl -w "@/srv/tilecache/tilecache-curl-time.txt" -o /dev/null -s -k -4 \ +--max-time 60 \ +'http://localhost:8080/19/262106/174485.png' \ +-H 'authority: c.tile.openstreetmap.org' \ +-H 'sec-fetch-dest: image' \ +-H 'user-agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36' \ +-H 'dnt: 1' \ +-H 'accept: image/webp,image/apng,image/*,*/*;q=0.8' \ +-H 'sec-fetch-site: same-site' \ +-H 'sec-fetch-mode: no-cors' \ +-H 'referer: https://www.openstreetmap.org/' \ +-H 'accept-language: en-GB,en-US;q=0.9,en;q=0.8' \ +--compressed >> /srv/tilecache/data/$(date --utc "+%Y/%m")/localhost-<%= node.name.split(".").first %>-$(date --utc "+%Y-%m-%dT%H").txt # render <% @renders.each do |render| -%> -<% if render[:hostname] != node[:hostname] -%> +<% if render.name != node.name -%> <% render.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%> curl -w "@/srv/tilecache/tilecache-curl-time.txt" -o /dev/null -s -k -4 \ --max-time 60 \ - 'https://<%= render[:hostname] %>.openstreetmap.org/19/262106/174485.png' \ + 'https://<%= render.name %>/19/262106/174485.png' \ -H 'authority: c.tile.openstreetmap.org' \ -H 'sec-fetch-dest: image' \ -H 'user-agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36' \ @@ -16,17 +30,17 @@ mkdir -p /srv/tilecache/data/$(date --utc "+%Y/%m") -H 'sec-fetch-mode: no-cors' \ -H 'referer: https://www.openstreetmap.org/' \ -H 'accept-language: en-GB,en-US;q=0.9,en;q=0.8' \ - --compressed >> /srv/tilecache/data/$(date --utc "+%Y/%m")/render-<%= render[:hostname] %>-$(date --utc --iso-8601).txt + --compressed >> /srv/tilecache/data/$(date --utc "+%Y/%m")/render-<%= render.name.split(".").first %>-$(date --utc "+%Y-%m-%dT%H").txt <% end -%> <% end -%> <% end -%> # caches <% @caches.each do |cache| -%> -<% if cache[:hostname] != node[:hostname] -%> +<% if cache.name != node.name -%> <% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%> curl -w "@/srv/tilecache/tilecache-curl-time.txt" -o /dev/null -s -k -4 \ --max-time 60 \ - 'https://<%= cache[:hostname] %>.openstreetmap.org/19/262106/174485.png' \ + 'https://<%= cache.name %>/19/262106/174485.png' \ -H 'authority: c.tile.openstreetmap.org' \ -H 'sec-fetch-dest: image' \ -H 'user-agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36' \ @@ -36,7 +50,7 @@ mkdir -p /srv/tilecache/data/$(date --utc "+%Y/%m") -H 'sec-fetch-mode: no-cors' \ -H 'referer: https://www.openstreetmap.org/' \ -H 'accept-language: en-GB,en-US;q=0.9,en;q=0.8' \ - --compressed >> /srv/tilecache/data/$(date --utc "+%Y/%m")/tilecache-<%= cache[:hostname] %>-$(date --utc --iso-8601).txt + --compressed >> /srv/tilecache/data/$(date --utc "+%Y/%m")/tilecache-<%= cache.name.split(".").first %>-$(date --utc "+%Y-%m-%dT%H").txt <% end -%> <% end -%> <% end -%>