Merge lp:~blr/charms/precise/squid-forwardproxy/auth-params-before-acls into lp:~canonical-launchpad-branches/charms/precise/squid-forwardproxy/trunk

Proposed by Kit Randel on 2015-09-29
Status: Merged
Approved by: Kit Randel on 2015-09-29
Approved revision: 43
Merged at revision: 33
Proposed branch: lp:~blr/charms/precise/squid-forwardproxy/auth-params-before-acls
Merge into: lp:~canonical-launchpad-branches/charms/precise/squid-forwardproxy/trunk
Diff against target: 33 lines (+8/-8)
1 file modified
templates/main_config.template (+8/-8)
To merge this branch: bzr merge lp:~blr/charms/precise/squid-forwardproxy/auth-params-before-acls
Reviewer Review Type Date Requested Status
Canonical Launchpad Branches 2015-09-29 Pending
Review via email: mp+272677@code.launchpad.net

Commit message

Define auth_params before ACLs.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/main_config.template'
2--- templates/main_config.template 2015-08-14 00:45:46 +0000
3+++ templates/main_config.template 2015-09-29 02:04:32 +0000
4@@ -37,6 +37,14 @@
5 {% endfor -%}
6 refresh_pattern . 30 20% 4320
7
8+{% for auth in auth_params %}
9+{% for key, val in auth.iteritems() -%}
10+{% if key != 'scheme' -%}
11+auth_param {{ auth['scheme'] }} {{ key }} {{ val }}
12+{% endif -%}
13+{% endfor -%}
14+{% endfor %}
15+
16 {% for acls, access in acls_and_access -%}
17 {% set idx = loop.index -%}
18 {% for acl_name, (acl_type, acl_vals) in acls.items() -%}
19@@ -47,14 +55,6 @@
20 http_access {{ access['http_access'] }} {% for acl_spec in access['acls'] -%} {{ acl_spec }} {% endfor %}
21 {% endfor %}
22
23-{% for auth in auth_params %}
24-{% for key, val in auth.iteritems() -%}
25-{% if key != 'scheme' -%}
26-auth_param {{ auth['scheme'] }} {{ key }} {{ val }}
27-{% endif -%}
28-{% endfor -%}
29-{% endfor %}
30-
31 {% for relid in relations.keys() -%}
32 {% if relations[relid].sitenames -%}
33 {% for sitename in relations[relid].sitenames -%}

Subscribers

People subscribed via source and target branches

to all changes: