From: Tom Hughes <tom@compton.nu>
Date: Sat, 10 Feb 2018 14:28:51 +0000 (+0000)
Subject: Use https between tile caches and render servers
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/7b1b204f12857077361bdaf729c97414c45daa98?hp=93e92b84438ecf5422bdd9c685ae986be229068d

Use https between tile caches and render servers
---

diff --git a/cookbooks/tilecache/templates/default/squid.conf.erb b/cookbooks/tilecache/templates/default/squid.conf.erb
index b6ca8e419..8c2adc7c1 100644
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -102,12 +102,12 @@ cache deny osmtile_sites osmtile_nocache_url
 cache_peer <%= sibling %> sibling 3128 3130 weight=1500
 <% end -%>
 #Primary Parent
-cache_peer <%= node[:tilecache][:tile_parent] %> parent 80 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=120 no-digest weight=1000
+cache_peer <%= node[:tilecache][:tile_parent] %> parent 443 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=120 no-digest weight=1000 ssl ssldomain=render.openstreetmap.org
 cache_peer_access osmtileAccel allow osmtile_sites
 
 #Backup Parents
 <% @renders.each do |renders| -%>
-cache_peer <%= renders[:hostname] %>.render.openstreetmap.org parent 80 0 no-query originserver name=osmtileAccelBackup<%= renders[:hostname] %> login=PASS connect-timeout=60 no-digest weight=10
+cache_peer <%= renders[:hostname] %>.render.openstreetmap.org parent 443 0 no-query originserver name=osmtileAccelBackup<%= renders[:hostname] %> login=PASS connect-timeout=60 no-digest weight=10 ssl ssldomain=render.openstreetmap.org
 cache_peer_access osmtileAccelBackup<%= renders[:hostname] %> allow osmtile_sites
 <% end -%>