Merge lp:~cjwatson/charms/precise/squid-forwardproxy/dns-v4-first into lp:~canonical-launchpad-branches/charms/precise/squid-forwardproxy/trunk

[Colin Watson]

Add dns_v4_first configuration option.

PS4.5 doesn't have IPv6 yet, so Squid's default of preferring IPv6 addresses fails.

[William Grant (wgrant)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2016-07-05 11:24:43 +0000
+++ config.yaml	2018-09-05 10:30:22 +0000
@@ -99,3 +99,7 @@
     default: '027'
     description: >
       Minimum umask which should be enforced while the proxy is running.
+  dns_v4_first:
+    type: boolean
+    default: false
+    description: If true, prefer IPv4 addresses for dual-stack sites.

=== modified file 'templates/main_config.template'
--- templates/main_config.template	2016-07-05 11:24:43 +0000
+++ templates/main_config.template	2018-09-05 10:30:22 +0000
@@ -19,6 +19,10 @@
 snmp_incoming_address {{ config.my_ip_address }}
 {% endif %}
 
+{% if config.dns_v4_first %}
+dns_v4_first on
+{% endif %}
+
 umask {{ config.umask }}
 
 logformat combined {{ config.log_format }}