Merge pull request #1560 from evbevz/squid_auth_reorder

squid.conf: reorder pre-auth plugins and local auth settings

src/opnsense/service/templates/OPNsense/Proxy/squid.conf

@@ -270,14 +270,14 @@ icap_service request_mod reqmod_precache {{OPNsense.proxy.forward.icap.RequestUR
 icap_enable off
 {% endif %}
 
+# Pre-auth plugins
+include /usr/local/etc/squid/pre-auth/*.conf
+
 # Authentication Settings
 {% if helpers.exists('OPNsense.proxy.forward.authentication.method') and  OPNsense.proxy.forward.authentication.method != '' %}
 {% include ['OPNsense/Proxy/squid.user.alt_auth.conf', 'OPNsense/Proxy/squid.user.local_auth.conf'] %}
 {% endif %}
 
-# Pre-auth plugins
-include /usr/local/etc/squid/pre-auth/*.conf
-
 {% include "OPNsense/Proxy/squid.acl.conf" ignore missing with context %}
 
 # Post-auth plugins