From: Grant Slater <git@firefishy.com>
Date: Sat, 4 Apr 2020 21:13:20 +0000 (+0100)
Subject: tilecache: fix path typo
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/05ee9b13b9f827d40400ef16d756f882b14953d7

tilecache: fix path typo
---

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index a9952b9f9..bde954995 100644
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -179,26 +179,26 @@ template "/etc/cron.d/tilecache" do
   mode 0o644
 end
 
-directory "/src/tilecache"
+directory "/srv/tilecache"
   owner "root"
   group "root"
   mode 0o755
 end
 
-directory "/src/tilecache/data"
+directory "/srv/tilecache/data"
   owner "www-data"
   group "www-data"
   mode 0o755
 end
 
-file "/src/tilecache/tilecache-curl-time.txt" do
+file "/srv/tilecache/tilecache-curl-time.txt" do
   source "tilecache-curl-time.txt"
   owner "root"
   group "root"
   mode 0o755
 end
 
-template "/src/tilecache/tilecache-curl-time" do
+template "/srv/tilecache/tilecache-curl-time" do
   source "tilecache-curl-time.erb"
   owner "root"
   group "root"
diff --git a/cookbooks/tilecache/templates/default/tilecache-curl-time.erb b/cookbooks/tilecache/templates/default/tilecache-curl-time.erb
index cc066c0f1..fc401bd99 100644
--- a/cookbooks/tilecache/templates/default/tilecache-curl-time.erb
+++ b/cookbooks/tilecache/templates/default/tilecache-curl-time.erb
@@ -1,9 +1,9 @@
 #!/bin/bash
-mkdir -p /src/tilecache/data/$(date --utc "+%Y/%m")
+mkdir -p /srv/tilecache/data/$(date --utc "+%Y/%m")
 <% @caches.each do |cache| -%>
 <% if cache[:hostname] != node[:hostname] -%>
 <% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
-    curl -w "@/src/tilecache/tilecache-curl-time.txt" -o /dev/null -s -k -4 \
+    curl -w "@/srv/tilecache/tilecache-curl-time.txt" -o /dev/null -s -k -4 \
     'https://<%= cache[:hostname] %>/19/262106/174485.png' \
     -H 'authority: c.tile.openstreetmap.org' \
     -H 'sec-fetch-dest: image' \
@@ -14,14 +14,14 @@ mkdir -p /src/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 | tee -a /src/tilecache/data/$(date --utc "+%Y/%m")/tilecache-<%= render[:hostname] %>-$(date --utc --iso-8601).txt
+    --compressed | tee -a /srv/tilecache/data/$(date --utc "+%Y/%m")/tilecache-<%= render[:hostname] %>-$(date --utc --iso-8601).txt
 <% end -%>
 <% end -%>
 <% end -%>
 <% @renders.each do |render| -%>
 <% if render[:hostname] != node[:hostname] -%>
 <% render.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
-      curl -w "@/src/tilecache/tilecache-curl-time.txt" -o /dev/null -s -k -4 \
+      curl -w "@/srv/tilecache/tilecache-curl-time.txt" -o /dev/null -s -k -4 \
       'https://<%= render[:hostname] %>/19/262106/174485.png' \
       -H 'authority: c.tile.openstreetmap.org' \
       -H 'sec-fetch-dest: image' \
@@ -32,7 +32,7 @@ mkdir -p /src/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 | tee -a /src/tilecache/data/$(date --utc "+%Y/%m")/render-<%= render[:hostname] %>-$(date --utc --iso-8601).txt
+      --compressed | tee -a /srv/tilecache/data/$(date --utc "+%Y/%m")/render-<%= render[:hostname] %>-$(date --utc --iso-8601).txt
 <% end -%>
 <% end -%>
 <% end -%>