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

[Kit Randel]

Define auth_params before ACLs.

=== modified file 'templates/main_config.template'
--- templates/main_config.template	2015-08-14 00:45:46 +0000
+++ templates/main_config.template	2015-09-29 02:04:32 +0000
@@ -37,6 +37,14 @@
 {% endfor -%}
 refresh_pattern .               30      20%     4320
 
+{% for auth in auth_params %}
+{% for key, val in auth.iteritems() -%}
+{% if key != 'scheme' -%}
+auth_param {{ auth['scheme'] }} {{ key }} {{ val }}
+{% endif -%}
+{% endfor -%}
+{% endfor %}
+
 {% for acls, access in acls_and_access -%}
 {% set idx = loop.index -%}
 {% for acl_name, (acl_type, acl_vals) in acls.items() -%} 
@@ -47,14 +55,6 @@
 http_access {{ access['http_access'] }} {% for acl_spec in access['acls'] -%} {{ acl_spec }} {% endfor %}
 {% endfor %}
 
-{% for auth in auth_params %}
-{% for key, val in auth.iteritems() -%}
-{% if key != 'scheme' -%}
-auth_param {{ auth['scheme'] }} {{ key }} {{ val }}
-{% endif -%}
-{% endfor -%}
-{% endfor %}
-
 {% for relid in relations.keys() -%}
 {% if relations[relid].sitenames -%}
 {% for sitename in relations[relid].sitenames -%}