From: Grant Slater <git@firefishy.com>
Date: Sat, 18 Apr 2020 13:50:37 +0000 (+0100)
Subject: tilecache: prefer ipv4 peers
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/59ded59a740f2e4cc627ca185fac3a47a46529fd

tilecache: prefer ipv4 peers
---

diff --git a/cookbooks/nginx/templates/default/nginx.conf.erb b/cookbooks/nginx/templates/default/nginx.conf.erb
index 5e09d846b..f5d4fc269 100644
--- a/cookbooks/nginx/templates/default/nginx.conf.erb
+++ b/cookbooks/nginx/templates/default/nginx.conf.erb
@@ -47,7 +47,7 @@ http {
     ssl_trusted_certificate /etc/ssl/certs/ca-certificates.crt;
 
     ssl_dhparam /etc/ssl/certs/dhparam.pem;
-    resolver 127.0.0.53;
+    resolver 127.0.0.53 ipv6=off;
     resolver_timeout 5s;
 
     <% if node['nginx']['cache']['fastcgi']['enable'] -%>
diff --git a/cookbooks/squid/templates/default/squid.conf.erb b/cookbooks/squid/templates/default/squid.conf.erb
index 940eaae3f..a65436c45 100644
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -25,6 +25,7 @@ dns_retransmit_interval 2 seconds
 # Set low timeout
 dns_timeout 15 seconds
 <% end -%>
+dns_v4_first on
 
 # used by squidclient / munin
 http_port 3128