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
1=== modified file 'config.yaml'
2--- config.yaml 2016-07-05 11:24:43 +0000
3+++ config.yaml 2018-09-05 10:30:22 +0000
4@@ -99,3 +99,7 @@
5 default: '027'
6 description: >
7 Minimum umask which should be enforced while the proxy is running.
8+ dns_v4_first:
9+ type: boolean
10+ default: false
11+ description: If true, prefer IPv4 addresses for dual-stack sites.
12
13=== modified file 'templates/main_config.template'
14--- templates/main_config.template 2016-07-05 11:24:43 +0000
15+++ templates/main_config.template 2018-09-05 10:30:22 +0000
16@@ -19,6 +19,10 @@
17 snmp_incoming_address {{ config.my_ip_address }}
18 {% endif %}
19
20+{% if config.dns_v4_first %}
21+dns_v4_first on
22+{% endif %}
23+
24 umask {{ config.umask }}
25
26 logformat combined {{ config.log_format }}

Subscribers

People subscribed via source and target branches

to all changes: