Merge lp:~gnuoy/charms/precise/squid-reverseproxy/fix-for-squid-3.2 into lp:charms/squid-reverseproxy

[Liam Young]

[Liam Young (gnuoy)]

Sorry, an 'i' sneaked into the link referenced in the commit comment. It should be http://wiki.squid-cache.org/Squid-3.2

[Tom Haddon (mthaddon)]

Looks good.

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-10-29 17:37:20 +0000
+++ hooks/hooks.py	2014-03-18 09:13:44 +0000
@@ -11,6 +11,7 @@
 import yaml
 import collections
 import socket
+import apt_pkg
 
 from charmhelpers.core.hookenv import (
     config as config_get,
@@ -243,6 +244,14 @@
             16 * int(config_data['target_objs_per_dir']) * int(
                 config_data['avg_obj_size_kb'])))))
     config_data['cache_l2'] = config_data['cache_l1'] * 16
+    apt_pkg.init()
+    cache = apt_pkg.Cache()
+    pkg = cache['squid3']
+    # From 3.2 the manager, localhost, and to_localhost ACL definitions are now
+    # built-in. So, detect the package version and remove the definitions from
+    # the generated config
+    need_localacl_defs = apt_pkg.version_compare(pkg.current_ver.ver_str,
+                                                 '3.2')
     templ_vars = {
         'config': config_data,
         'sites': reverse_sites,
@@ -250,6 +259,7 @@
         'only_direct': only_direct,
         'refresh_patterns': refresh_patterns,
         'default_refresh_pattern': default_refresh_pattern,
+        'need_localacl_defs': need_localacl_defs,
     }
     template = template_env.get_template('main_config.template').\
         render(templ_vars)

=== modified file 'templates/main_config.template'
--- templates/main_config.template	2013-10-29 17:37:20 +0000
+++ templates/main_config.template	2014-03-18 09:13:44 +0000
@@ -1,8 +1,11 @@
 http_port {{ config.port }} {{ config.port_options }}
 
+{% if need_localacl_defs < 0 -%}
 acl manager proto cache_object
 acl localhost src 127.0.0.1/32
 acl to_localhost dst 127.0.0.0/8
+{% endif -%}
+
 acl PURGE method PURGE
 acl CONNECT method CONNECT
 acl SSL_ports port 443