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

Proposed by Colin Watson on 2018-09-05
Status: Merged
Merged at revision: 40
Proposed branch: lp:~cjwatson/charms/precise/squid-forwardproxy/dns-v4-first
Merge into: lp:~canonical-launchpad-branches/charms/precise/squid-forwardproxy/trunk
Diff against target: 26 lines (+8/-0)
2 files modified
config.yaml (+4/-0)
templates/main_config.template (+4/-0)
To merge this branch: bzr merge lp:~cjwatson/charms/precise/squid-forwardproxy/dns-v4-first
Reviewer Review Type Date Requested Status
William Grant 2018-09-05 Approve on 2018-09-05
Review via email: mp+354316@code.launchpad.net

Commit message

Add dns_v4_first configuration option.

Description of the change

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

To post a comment you must log in.
William Grant (wgrant) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
99 default: '027'99 default: '027'
100 description: >100 description: >
101 Minimum umask which should be enforced while the proxy is running.101 Minimum umask which should be enforced while the proxy is running.
102 dns_v4_first:
103 type: boolean
104 default: false
105 description: If true, prefer IPv4 addresses for dual-stack sites.
102106
=== 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 @@
19snmp_incoming_address {{ config.my_ip_address }}19snmp_incoming_address {{ config.my_ip_address }}
20{% endif %}20{% endif %}
2121
22{% if config.dns_v4_first %}
23dns_v4_first on
24{% endif %}
25
22umask {{ config.umask }}26umask {{ config.umask }}
2327
24logformat combined {{ config.log_format }}28logformat combined {{ config.log_format }}

Subscribers

People subscribed via source and target branches

to all changes: