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

[chef.git] / cookbooks / tilecache / templates / default / tilecache-curl-time.erb

diff --git a/cookbooks/tilecache/templates/default/tilecache-curl-time.erb b/cookbooks/tilecache/templates/default/tilecache-curl-time.erb
index a5d3fb8d769414561d3a4c6ab22f3a51e25db66f..6abd2ea93db16e52033fe3a73f7e5e92a5d09d6c 100644 (file)
--- a/cookbooks/tilecache/templates/default/tilecache-curl-time.erb
+++ b/cookbooks/tilecache/templates/default/tilecache-curl-time.erb
@@ -1,12 +1,27 @@
 #!/bin/bash
 #!/bin/bash

+sleep $[ ( $RANDOM % 20 )  + 1 ]

 mkdir -p /srv/tilecache/data/$(date --utc "+%Y/%m")
 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| -%>
 # 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 \
 <% 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' \
     -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 +31,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' \
     -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 "+%Y-%m-%dT%H").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| -%>
 <% 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 \
 <% 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' \
     -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 +51,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' \
     -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 "+%Y-%m-%dT%H").txt
+    --compressed >> /srv/tilecache/data/$(date --utc "+%Y/%m")/tilecache-<%= cache.name.split(".").first %>-$(date --utc "+%Y-%m-%dT%H").txt

 <% end -%>
 <% end -%>
 <% end -%>
 <% end -%>
 <% end -%>
 <% end -%>