Merge lp:~sidnei/charms/precise/squid-reverseproxy/trunk into lp:charms/squid-reverseproxy

[Sidnei da Silva]

Greatly improved test coverage. Better interaction with upstream and downstream services, namely apache2 and haproxy.

* Greatly improve test coverage

* Allow the use of an X-Balancer-Name header to select which cache_peer backend will be used for a specific request.

  This is useful if you have multiple applications sitting behind a single hostname being directed to the same Squid from an Apache service, using the balancer relation. Since you can't rely on 'dstdomain' anymore, this special header is set by the Apache charm in the balancer, and used instead.

* Support 'all-services' being set in the relation, in the way that the haproxy sets it, in addition to the previously supported 'sitenames' setting. Makes it compatible with the haproxy charm.

* When the list of supported 'sitenames' (computed from dstdomain acls) changes, notify services related via the 'cached-website' relation. This allows to add new services in the haproxy service (or really, any other service related), which notifies the squid service, which then bubbles up to services related via cached-website.

[lp:~sidnei/charms/precise/squid-reverseproxy/trunk]

33. By Haw Loeung on 2013-02-26

[jjo] Don't use absolute path to call juju cmds - needed to allow /usr/local/bin/ overrides if e.g. using branched juju (until LP#1118945 is fixed)

[Mark Mims (mark-mims)]

same as apache... please reserve /tests for charm tests

review: Needs Resubmitting

[lp:~sidnei/charms/precise/squid-reverseproxy/trunk]

34. By David Ames on 2013-03-29

[dames,r=wedgwood] Set hostname on cached-website relation hook. Needed for haproxy charm

35. By David Ames on 2013-03-29

[dames,r=wedgwood] Add missing nagios_check_http_params to config.yaml

36. By David Ames on 2013-05-07

[sidnei,r=dames] - Improve test coverage (from 0% to 51%)
- Add helper scripts to run coverage/lint/tests
- Add support for relating with haproxy, which exports multiple (service_name, port) combos via 'all_services', assuming that the service_name exported is to be used as the dstdomain or balancer name in Apache
- If enable, match incoming requests on the X-Balancer-Name header, set by the modified apache2 charm, instead of matching on dstdomain (aka Host header, which isn't set by the apache2 charm when using balancer:).

37. By David Ames on 2013-05-07

[dames,trivial] Fixes to previous merge

38. By Liam Young on 2013-06-03

Merged from ~ubuntuone-pqm-team. Bump charmsupport, and add extra options to refresh_pattern.

39. By Tom Haddon on 2013-08-29

Merge from U1 version to get the two in sync

40. By Matthias Arnason on 2013-09-17

[bloodearnest r=tiaz] add ability to disable caching and just proxy

41. By Matthias Arnason on 2013-10-29

[sidnei r=tiaz] Expose 'via' config setting, default to on.

42. By JuanJo Ciarlante on 2013-11-08

[sidnei, r=jjo] When setting cache_size_mb to 0 disable only *disk* cache, not all caching.

43. By JuanJo Ciarlante on 2013-11-20

[sidnei,r=jjo] If there's a query string in the path, use GET instead of HEAD

44. By Sidnei da Silva on 2013-12-10

Merge from alexlist's https support branch

45. By Sidnei da Silva on 2013-12-10

- Merge from trunk

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2013-02-15 02:21:16 +0000
+++ .bzrignore	2013-04-16 21:22:23 +0000
@@ -1,1 +1,9 @@
-basenode/
+revision
+_trial_temp
+.coverage
+coverage.xml
+*.crt
+*.key
+lib/*
+*.pyc
+exec.d

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2013-04-16 21:22:23 +0000
@@ -0,0 +1,36 @@
+PWD := $(shell pwd)
+SOURCEDEPS_DIR ?= $(shell dirname $(PWD))/.sourcecode
+HOOKS_DIR := $(PWD)/hooks
+TEST_PREFIX := PYTHONPATH=$(HOOKS_DIR)
+TEST_DIR := $(PWD)/hooks/tests
+CHARM_DIR := $(PWD)
+PYTHON := /usr/bin/env python
+
+
+build: sourcedeps test lint proof
+
+revision:
+	@test -f revision || echo 0 > revision
+
+proof: revision
+	@echo Proofing charm...
+	@charm proof $(PWD) && echo OK
+	@test `cat revision` = 0 && rm revision
+
+test:
+	@echo Starting tests...
+	@CHARM_DIR=$(CHARM_DIR) $(TEST_PREFIX) nosetests $(TEST_DIR)
+
+lint:
+	@echo Checking for Python syntax...
+	@flake8 $(HOOKS_DIR) --ignore=E123 && echo OK
+
+sourcedeps: $(PWD)/config-manager.txt
+	@echo Updating source dependencies...
+	@$(PYTHON) cm.py -c $(PWD)/config-manager.txt \
+		-p $(SOURCEDEPS_DIR) \
+		-t $(PWD)
+
+charm-payload: sourcedeps
+
+.PHONY: revision proof test lint sourcedeps charm-payload

=== added file 'cm.py'
--- cm.py	1970-01-01 00:00:00 +0000
+++ cm.py	2013-04-16 21:22:23 +0000
@@ -0,0 +1,172 @@
+# Copyright 2010-2012 Canonical Ltd. All rights reserved.
+
+import os
+import re
+import sys
+import errno
+import hashlib
+import subprocess
+import optparse
+import urllib
+
+from os import curdir
+from bzrlib.branch import Branch
+from bzrlib.plugin import load_plugins
+load_plugins()
+from bzrlib.plugins.launchpad import account as lp_account
+
+if 'GlobalConfig' in dir(lp_account):
+    from bzrlib.config import LocationConfig as LocationConfiguration
+    _ = LocationConfiguration
+else:
+    from bzrlib.config import LocationStack as LocationConfiguration
+    _ = LocationConfiguration
+
+
+def get_ubunet_branch_config(config_file):
+    """
+    Retrieves the sourcedeps configuration for an ubunet source dir.
+    Returns a dict of (branch, revspec) tuples, keyed by branch name.
+    """
+    branches = {}
+    with open(config_file, 'r') as stream:
+        for line in stream:
+            line = line.split('#')[0].strip()
+            match = re.match(r'(\S+)\s+'
+                             'bzr\+ssh://([^/]+)/([^;]+)'
+                             '(?:;revno=(\d+))?', line)
+            if match:
+                name, host, branch, revno = match.group(1, 2, 3, 4)
+                if revno is None:
+                    revspec = "-1"
+                else:
+                    revspec = revno
+                branches[name] = (host, branch, revspec)
+    return branches
+
+
+def main(config_file, parent_dir, target_dir, verbose):
+    """Do the deed."""
+
+    try:
+        os.makedirs(parent_dir)
+    except OSError, e:
+        if e.errno != errno.EEXIST:
+            raise
+
+    bzr_config = LocationConfiguration(parent_dir)
+    get_lp_login = lp_account.get_lp_login
+    username = get_lp_login(bzr_config) or get_lp_login()
+    if username is None:
+        raise RuntimeError("Unable to determine launchpad login")
+    quoted_username = urllib.quote(username)
+
+    branches = sorted(get_ubunet_branch_config(config_file).iteritems())
+    for branch_name, (host, quoted_branch_spec, revspec) in branches:
+        revno = int(revspec)
+
+        # qualify mirror branch name with hash of remote repo path to deal
+        # with changes to the remote branch URL over time
+        branch_spec_digest = hashlib.sha1(quoted_branch_spec).hexdigest()
+        branch_directory = branch_spec_digest
+
+        source_path = os.path.join(parent_dir, branch_directory)
+        destination_path = os.path.join(target_dir, branch_name)
+
+        # Remove leftover symlinks/stray files.
+        try:
+            os.remove(destination_path)
+        except OSError, e:
+            if e.errno != errno.EISDIR and e.errno != errno.ENOENT:
+                raise
+
+        branch_url = ("bzr+ssh://%s@%s/%s" %
+                      (quoted_username, host, quoted_branch_spec))
+        lp_url = "lp:" + quoted_branch_spec.replace("+branch/", "")
+
+        # Create the local mirror branch if it doesn't already exist
+        if verbose:
+            sys.stderr.write('%30s: ' % (branch_name,))
+            sys.stderr.flush()
+
+        fresh = False
+        if not os.path.exists(source_path):
+            subprocess.check_call(['bzr', 'branch', '-q',
+                                   '--', branch_url, source_path])
+            fresh = True
+
+        source_branch = Branch.open(source_path)
+
+        # Freshen the source branch if required (-1 means we want tip).
+        if not fresh and (revno == -1 or revno > source_branch.revno()):
+            subprocess.check_call(['bzr', 'pull', '-q', '--overwrite', '-r',
+                                   str(revno), '-d', source_path,
+                                   '--', branch_url])
+
+        if os.path.exists(destination_path):
+            # Overwrite the destination with the appropriate revision.
+            subprocess.check_call(['bzr', 'clean-tree', '--force', '-q',
+                                   '--ignored', '-d', destination_path])
+            subprocess.check_call(['bzr', 'pull', '-q', '--overwrite',
+                                   '-r', str(revno),
+                                   '-d', destination_path, '--', source_path])
+        else:
+            # Create a new branch.
+            subprocess.check_call(['bzr', 'branch', '-q', '--hardlink',
+                                   '-r', str(revno),
+                                   '--', source_path, destination_path])
+
+        # Check the state of the destination branch.
+        destination_branch = Branch.open(destination_path)
+        destination_revno = destination_branch.revno()
+
+        if verbose:
+            sys.stderr.write('checked out %4s of %s\n' %
+                             ("r" + str(destination_revno), lp_url))
+            sys.stderr.flush()
+
+        if revno != -1 and destination_revno != revno:
+            raise RuntimeError("Expected revno %d but got revno %d" %
+                               (revno, destination_revno))
+
+if __name__ == '__main__':
+    parser = optparse.OptionParser(
+        usage="%prog [options]",
+        description=(
+            "Add a lightweight checkout in <target> for each "
+            "corresponding file in <parent>."),
+        add_help_option=False)
+    parser.add_option(
+        '-p', '--parent', dest='parent', default=None,
+        help=("The directory of the parent tree."),
+        metavar="DIR")
+    parser.add_option(
+        '-t', '--target', dest='target', default=curdir,
+        help=("The directory of the target tree."),
+        metavar="DIR")
+    parser.add_option(
+        '-c', '--config', dest='config', default=None,
+        help=("The config file to be used for config-manager."),
+        metavar="DIR")
+    parser.add_option(
+        '-q', '--quiet', dest='verbose', action='store_false',
+        help="Be less verbose.")
+    parser.add_option(
+        '-h', '--help', action='help',
+        help="Show this help message and exit.")
+    parser.set_defaults(verbose=True)
+
+    options, args = parser.parse_args()
+
+    if options.parent is None:
+        parser.error(
+            "Parent directory not specified.")
+
+    if options.target is None:
+        parser.error(
+            "Target directory not specified.")
+
+    sys.exit(main(config_file=options.config,
+                  parent_dir=options.parent,
+                  target_dir=options.target,
+                  verbose=options.verbose))

=== added file 'config-manager.txt'
--- config-manager.txt	1970-01-01 00:00:00 +0000
+++ config-manager.txt	2013-04-16 21:22:23 +0000
@@ -0,0 +1,8 @@
+# After making changes to this file, to ensure that your sourcedeps are
+# up-to-date do:
+#
+#   make sourcedeps
+
+./lib/charmsupport                        bzr+ssh://bazaar.launchpad.net/~ubuntuone-pqm-team/charmsupport/trunk;revno=49
+./lib/charm-tools                         bzr+ssh://bazaar.launchpad.net/+branch/charm-tools;revno=172
+./lib/shelltoolbox                        bzr+ssh://bazaar.launchpad.net/+branch/python-shelltoolbox;revno=17

=== modified file 'config.yaml'
--- config.yaml	2013-01-11 16:49:35 +0000
+++ config.yaml	2013-04-16 21:22:23 +0000
@@ -3,10 +3,18 @@
     type: int
     default: 3128
     description: Squid listening port.
+  port_options:
+    type: string
+    default: accel vhost
+    description: Squid listening port options
   log_format:
     type: string
     default: '%>a %ui %un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st "%{Referer}>h" "%{User-Agent}>h" %Ss:%Sh'
     description: Format of the squid log.
+  x_balancer_name_allowed:
+    type: boolean
+    default: false
+    description: Route based on X-Balancer-Name header set by Apache charm.
   cache_mem_mb:
     type: int
     default: 256
@@ -51,20 +59,34 @@
             juju-squid-0
         If you're running multiple environments with the same services in them
         this allows you to differentiate between them.
-  nagios_check_url:
+  nagios_check_http_params:
     default: ""
     type: string
     description: >
-       The URL to check squid has access to, most likely inside your web server farm
+      The parameters to pass to the nrpe plugin check_http.
   nagios_service_type:
      default: "generic"
      type: string
      description: >
-        What service this component forms part of, e.g. supermassive-squid-cluster. Used by nrpe.
+       What service this component forms part of, e.g. supermassive-squid-cluster. Used by nrpe.
   refresh_patterns:
     type: string
     default: ''
     description: >
       JSON-formatted list of refresh patterns. For example:
       '{"http://www.ubuntu.com": {"min": 0, "percent": 20, "max": 60}, "http://www.canonical.com": {"min": 0, "percent": 20, "max": 120}}'
+  services:
+    default: ''
+    type: string
+    description: |
+        Services definition(s). Although the variable type is a string, this is
+        interpreted by the charm as yaml. To use multiple services within the
+        same instance, specify all of the variables (service_name,
+        service_host, service_port) with a "-" before the first variable,
+        service_name, as below.
 
+        - service_name: example_proxy
+          service_domain: example.com
+          servers:
+          - [foo.internal, 80]
+          - [bar.internal, 80]

=== added file 'hooks/_pythonpath.py'
--- hooks/_pythonpath.py	1970-01-01 00:00:00 +0000
+++ hooks/_pythonpath.py	2013-04-16 21:22:23 +0000
@@ -0,0 +1,40 @@
+import sys
+import os
+import os.path
+
+# Make sure that charmsupport is importable, or bail out.
+local_copy = os.path.join(
+    os.path.dirname(os.path.dirname(__file__)),
+    "lib", "charmsupport")
+if os.path.exists(local_copy) and os.path.isdir(local_copy):
+    sys.path.insert(0, local_copy)
+
+try:
+    import charmsupport
+    _ = charmsupport
+except ImportError:
+    sys.exit("Could not find required 'charmsupport' library.")
+
+# Make sure that shelltoolbox is importable, or bail out.
+local_copy = os.path.join(
+    os.path.dirname(os.path.dirname(__file__)),
+    "lib", "shelltoolbox")
+if os.path.exists(local_copy) and os.path.isdir(local_copy):
+    sys.path.insert(0, local_copy)
+try:
+    import shelltoolbox
+    _ = shelltoolbox
+except ImportError:
+    sys.exit("Could not find required 'shelltoolbox' library.")
+
+# Make sure that charmhelpers is importable, or bail out.
+local_copy = os.path.join(
+    os.path.dirname(os.path.dirname(__file__)),
+    "lib", "charm-tools", "helpers", "python")
+if os.path.exists(local_copy) and os.path.isdir(local_copy):
+    sys.path.insert(0, local_copy)
+try:
+    import charmhelpers
+    _ = charmhelpers
+except ImportError:
+    sys.exit("Could not find required 'charmhelpers' library.")

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-01-11 17:00:40 +0000
+++ hooks/hooks.py	2013-04-16 21:22:23 +0000
@@ -1,17 +1,29 @@
 #!/usr/bin/env python
 
-import glob
-import grp
 import json
 import math
 import os
-import pwd
 import random
 import re
 import shutil
 import string
 import subprocess
 import sys
+import yaml
+import collections
+import socket
+
+import _pythonpath
+_ = _pythonpath
+
+from charmsupport.hookenv import (
+    config as config_get,
+    log,
+    relation_set,
+    relation_ids as get_relation_ids,
+    relations_of_type,
+)
+from charmsupport.nrpe import NRPE
 
 ###############################################################################
 # Global variables
@@ -19,124 +31,87 @@
 default_squid3_config_dir = "/etc/squid3"
 default_squid3_config = "%s/squid.conf" % default_squid3_config_dir
 default_squid3_config_cache_dir = "/var/run/squid3"
-hook_name = os.path.basename(sys.argv[0])
+Server = collections.namedtuple("Server", "name address port options")
 
 ###############################################################################
 # Supporting functions
 ###############################################################################
 
 
-#------------------------------------------------------------------------------
-# config_get:  Returns a dictionary containing all of the config information
-#              Optional parameter: scope
-#              scope: limits the scope of the returned configuration to the
-#                     desired config item.
-#------------------------------------------------------------------------------
-def config_get(scope=None):
-    try:
-        config_cmd_line = ['config-get']
-        if scope is not None:
-            config_cmd_line.append(scope)
-        config_cmd_line.append('--format=json')
-        config_data = json.loads(subprocess.check_output(config_cmd_line))
-    except Exception, e:
-        subprocess.call(['juju-log', str(e)])
-        config_data = None
-    finally:
-        return(config_data)
-
-
-#------------------------------------------------------------------------------
-# relation_json:  Returns json-formatted relation data
-#                Optional parameters: scope, relation_id
-#                scope:        limits the scope of the returned data to the
-#                              desired item.
-#                unit_name:    limits the data ( and optionally the scope )
-#                              to the specified unit
-#                relation_id:  specify relation id for out of context usage.
-#------------------------------------------------------------------------------
-def relation_json(scope=None, unit_name=None, relation_id=None):
-    try:
-        relation_cmd_line = ['relation-get', '--format=json']
-        if relation_id is not None:
-            relation_cmd_line.extend(('-r', relation_id))
-        if scope is not None:
-            relation_cmd_line.append(scope)
-        else:
-            relation_cmd_line.append('-')
-        relation_cmd_line.append(unit_name)
-        relation_data = subprocess.check_output(relation_cmd_line)
-    except Exception, e:
-        subprocess.call(['juju-log', str(e)])
-        relation_data = None
-    finally:
-        return(relation_data)
-
-
-#------------------------------------------------------------------------------
-# relation_get:  Returns a dictionary containing the relation information
-#                Optional parameters: scope, relation_id
-#                scope:        limits the scope of the returned data to the
-#                              desired item.
-#                unit_name:    limits the data ( and optionally the scope )
-#                              to the specified unit
-#                relation_id:  specify relation id for out of context usage.
-#------------------------------------------------------------------------------
-def relation_get(scope=None, unit_name=None, relation_id=None):
-    try:
-        relation_data = json.loads(relation_json())
-    except Exception, e:
-        subprocess.call(['juju-log', str(e)])
-        relation_data = None
-    finally:
-        return(relation_data)
-
-
-#------------------------------------------------------------------------------
-# relation_ids:  Returns a list of relation ids
-#                optional parameters: relation_type
-#                relation_type: return relations only of this type
-#------------------------------------------------------------------------------
-def relation_ids(relation_types=['website']):
-    # accept strings or iterators
-    if isinstance(relation_types, basestring):
-        reltypes = [relation_types]
-    else:
-        reltypes = relation_types
-    relids = []
-    for reltype in reltypes:
-        relid_cmd_line = ['relation-ids', '--format=json', reltype]
-        relids.extend(json.loads(subprocess.check_output(relid_cmd_line)))
-    return relids
-
-
-#------------------------------------------------------------------------------
-# relation_get_all:  Returns a dictionary containing the relation information
-#                optional parameters: relation_type
-#                relation_type: limits the scope of the returned data to the
-#                               desired item.
-#------------------------------------------------------------------------------
-def relation_get_all():
-    reldata = {}
-    try:
-        relids = relation_ids()
-        for relid in relids:
-            units_cmd_line = ['relation-list', '--format=json', '-r', relid]
-            units = json.loads(subprocess.check_output(units_cmd_line))
-            for unit in units:
-                reldata[unit] = \
-                    json.loads(relation_json(
-                        relation_id=relid, unit_name=unit))
-                if 'sitenames' in reldata[unit]:
-                    reldata[unit]['sitenames'] = \
-                        reldata[unit]['sitenames'].split()
-                reldata[unit]['relation-id'] = relid
-                reldata[unit]['name'] = unit.replace("/", "_")
-    except Exception, e:
-        subprocess.call(['juju-log', str(e)])
-        reldata = []
-    finally:
-        return(reldata)
+def get_id(sitename, relation_id, unit_name):
+    unit_name = unit_name.replace('/', '_').replace('.', '_')
+    relation_id = relation_id.replace(':', '_').replace('.', '_')
+    if sitename is None:
+        return relation_id + '__' + unit_name
+    return sitename.replace('.', '_') + '__' + relation_id + '__' + unit_name
+
+
+def get_relation_sites():
+    all_sites = {}
+
+    config_data = config_get()
+    config_services = yaml.safe_load(config_data.get("services", "")) or ()
+    server_options_by_site = {}
+
+    for service_item in config_services:
+        site = service_item["service_name"]
+        servers = all_sites.setdefault(site, [])
+        options = " ".join(service_item.get("server_options", []))
+        server_options_by_site[site] = options
+        for host, port in service_item["servers"]:
+            servers.append(
+                Server(name=get_id(None, site, host),
+                       address=host, port=port,
+                       options=options))
+
+    relations = relations_of_type("website")
+
+    for relation_data in relations:
+        unit = relation_data["__unit__"]
+        relation_id = relation_data["__relid__"]
+        if not ("port" in relation_data or "all_services" in relation_data):
+            log("No port in relation data for '%s', skipping." % unit)
+            continue
+
+        if not "private-address" in relation_data:
+            log("No private-address in relation data "
+                "for '%s', skipping." % unit)
+            continue
+
+        for site in relation_data.get("sitenames", "").split():
+            servers = all_sites.setdefault(site, [])
+            servers.append(
+                Server(name=get_id(site, relation_id, unit),
+                       address=relation_data["private-address"],
+                       port=relation_data["port"],
+                       options=server_options_by_site.get(site, '')))
+
+        services = yaml.safe_load(relation_data.get("all_services", "")) or ()
+        for service_item in services:
+            site = service_item["service_name"]
+            servers = all_sites.setdefault(site, [])
+            servers.append(
+                Server(name=get_id(site, relation_id, unit),
+                       address=relation_data["private-address"],
+                       port=service_item["service_port"],
+                       options=server_options_by_site.get(site, '')))
+
+        if not ("sitenames" in relation_data or
+                "all_services" in relation_data):
+            servers = all_sites.setdefault(None, [])
+            servers.append(
+                Server(name=get_id(None, relation_id, unit),
+                       address=relation_data["private-address"],
+                       port=relation_data["port"],
+                       options=server_options_by_site.get(None, '')))
+
+    if len(all_sites) == 0:
+        return
+
+    for site, servers in all_sites.iteritems():
+        servers.sort()
+
+    return all_sites
 
 
 #------------------------------------------------------------------------------
@@ -144,13 +119,13 @@
 #------------------------------------------------------------------------------
 def apt_get_install(packages=None):
     if packages is None:
-        return(False)
+        return False
     cmd_line = ['apt-get', '-y', 'install', '-qq']
     try:
         cmd_line.extend(packages.split())
     except AttributeError:
         cmd_line.extend(packages)
-    return(subprocess.call(cmd_line))
+    return subprocess.call(cmd_line)
 
 
 #------------------------------------------------------------------------------
@@ -169,9 +144,8 @@
 #------------------------------------------------------------------------------
 def load_squid3_config(squid3_config_file="/etc/squid3/squid.conf"):
     if os.path.isfile(squid3_config_file):
-        return(open(squid3_config_file).read())
-    else:
-        return(None)
+        return open(squid3_config_file).read()
+    return
 
 
 #------------------------------------------------------------------------------
@@ -183,8 +157,8 @@
 def get_service_ports(squid3_config_file="/etc/squid3/squid.conf"):
     squid3_config = load_squid3_config(squid3_config_file)
     if squid3_config is None:
-        return(None)
-    return(re.findall("http_port ([0-9]+)", squid3_config))
+        return
+    return re.findall("http_port ([0-9]+)", squid3_config)
 
 
 #------------------------------------------------------------------------------
@@ -195,9 +169,9 @@
 def get_sitenames(squid3_config_file="/etc/squid3/squid.conf"):
     squid3_config = load_squid3_config(squid3_config_file)
     if squid3_config is None:
-        return(None)
-    sitenames = re.findall("cache_peer_domain \w+ ([^!].*)", squid3_config)
-    return(list(set(sitenames)))
+        return
+    sitenames = re.findall("acl [\w_-]+ dstdomain ([^!].*)", squid3_config)
+    return list(set(sitenames))
 
 
 #------------------------------------------------------------------------------
@@ -206,9 +180,9 @@
 #------------------------------------------------------------------------------
 def open_port(port=None, protocol="TCP"):
     if port is None:
-        return(None)
-    return(subprocess.call(['/usr/bin/open-port', "%d/%s" %
-                            (int(port), protocol)]))
+        return
+    return subprocess.call(['open-port', "%d/%s" %
+                            (int(port), protocol)])
 
 
 #------------------------------------------------------------------------------
@@ -217,9 +191,9 @@
 #------------------------------------------------------------------------------
 def close_port(port=None, protocol="TCP"):
     if port is None:
-        return(None)
-    return(subprocess.call(['/usr/bin/close-port', "%d/%s" %
-                            (int(port), protocol)]))
+        return
+    return subprocess.call(['close-port', "%d/%s" %
+                            (int(port), protocol)])
 
 
 #------------------------------------------------------------------------------
@@ -229,7 +203,7 @@
 #------------------------------------------------------------------------------
 def update_service_ports(old_service_ports=None, new_service_ports=None):
     if old_service_ports is None or new_service_ports is None:
-        return(None)
+        return
     for port in old_service_ports:
         if port not in new_service_ports:
             close_port(port)
@@ -248,7 +222,7 @@
                           if l not in 'Iil0oO1']
     random_chars = [random.choice(alphanumeric_chars)
                     for i in range(pwd_length)]
-    return(''.join(random_chars))
+    return ''.join(random_chars)
 
 
 #------------------------------------------------------------------------------
@@ -257,27 +231,54 @@
 def construct_squid3_config():
     from jinja2 import Environment, FileSystemLoader
     config_data = config_get()
-    relations = relation_get_all()
+    sites = get_relation_sites()
+    only_direct = set()
+    if sites is not None:
+        for site, servers in sites.iteritems():
+            if not servers:
+                only_direct.add(site)
+
     if config_data['refresh_patterns']:
-        refresh_patterns = json.loads(config_data['refresh_patterns'])
+        ## Try originally supported JSON formatted config
+        try:
+            refresh_patterns = json.loads(config_data['refresh_patterns'])
+        ## else use YAML (current):
+        except ValueError:
+            refresh_patterns = yaml.load(config_data['refresh_patterns'])
     else:
         refresh_patterns = {}
+    # Use default refresh pattern if specified.
+    if '.' in refresh_patterns:
+        default_refresh_pattern = refresh_patterns.pop('.')
+    else:
+        default_refresh_pattern = {
+            'min': 30,
+            'percent': 20,
+            'max': 4320,
+        }
+
     template_env = Environment(loader=FileSystemLoader(
         os.path.join(os.environ['CHARM_DIR'], 'templates')))
     config_data['cache_l1'] = int(math.ceil(math.sqrt(
-        int(config_data['cache_size_mb']) * 1024 / (16 *
-        int(config_data['target_objs_per_dir']) * int(
-            config_data['avg_obj_size_kb'])))))
+        int(config_data['cache_size_mb']) * 1024 / (
+            16 * int(config_data['target_objs_per_dir']) * int(
+                config_data['avg_obj_size_kb'])))))
     config_data['cache_l2'] = config_data['cache_l1'] * 16
     templ_vars = {
         'config': config_data,
-        'relations': relations,
+        'sites': sites,
+        'only_direct': only_direct,
         'refresh_patterns': refresh_patterns,
+        'default_refresh_pattern': default_refresh_pattern,
     }
     template = template_env.get_template('main_config.template').\
         render(templ_vars)
+    write_squid3_config(str(template))
+
+
+def write_squid3_config(contents):
     with open(default_squid3_config, 'w') as squid3_config:
-        squid3_config.write(str(template))
+        squid3_config.write(contents)
 
 
 #------------------------------------------------------------------------------
@@ -286,139 +287,146 @@
 #------------------------------------------------------------------------------
 def service_squid3(action=None, squid3_config=default_squid3_config):
     if action is None or squid3_config is None:
-        return(None)
+        return
     elif action == "check":
         check_cmd = ['/usr/sbin/squid3', '-f', squid3_config, '-k', 'parse']
         retVal = subprocess.call(check_cmd)
         if retVal == 1:
-            return(False)
+            return False
         elif retVal == 0:
-            return(True)
+            return True
         else:
-            return(False)
+            return False
     elif action == 'status':
         status = subprocess.check_output(['status', 'squid3'])
         if re.search('running', status) is not None:
-            return(True)
+            return True
         else:
-            return(False)
+            return False
     elif action in ('start', 'stop', 'reload', 'restart'):
         retVal = subprocess.call([action, 'squid3'])
         if retVal == 0:
-            return(True)
+            return True
         else:
-            return(False)
+            return False
 
 
 def update_nrpe_checks():
-    config_data = config_get()
-    try:
-        nagios_uid = pwd.getpwnam('nagios').pw_uid
-        nagios_gid = grp.getgrnam('nagios').gr_gid
-    except:
-        subprocess.call(['juju-log', "Nagios user not setup, exiting"])
-        return
-
-    unit_name = os.environ['JUJU_UNIT_NAME'].replace('/', '-')
-    nrpe_check_file = '/etc/nagios/nrpe.d/check_squidrp.cfg'
-    nagios_hostname = "%s-%s" % (config_data['nagios_context'], unit_name)
-    nagios_logdir = '/var/log/nagios'
-    nagios_exportdir = '/var/lib/nagios/export'
-    nrpe_service_file = \
-        '/var/lib/nagios/export/service__%s_check_squidrp.cfg' % \
-            (nagios_hostname)
-    if not os.path.exists(nagios_logdir):
-        os.mkdir(nagios_logdir)
-        os.chown(nagios_logdir, nagios_uid, nagios_gid)
-    if not os.path.exists(nagios_exportdir):
-        subprocess.call(['juju-log', 'Exiting as %s is not accessible' %
-            (nagios_exportdir)])
-        return
-    for f in os.listdir(nagios_exportdir):
-        if re.search('.*check_squidrp.cfg', f):
-            os.remove(os.path.join(nagios_exportdir, f))
-    from jinja2 import Environment, FileSystemLoader
-    template_env = Environment(
-        loader=FileSystemLoader(os.path.join(os.environ['CHARM_DIR'], 'templates')))
-    templ_vars = {
-        'nagios_hostname': nagios_hostname,
-        'nagios_servicegroup': config_data['nagios_context'],
-    }
-    template = template_env.get_template('nrpe_service.template').\
-        render(templ_vars)
-    with open(nrpe_service_file, 'w') as nrpe_service_config:
-        nrpe_service_config.write(str(template))
-    with open(nrpe_check_file, 'w') as nrpe_check_config:
-        nrpe_check_config.write("# check squid\n")
-        nrpe_check_config.write(
-            "command[check_squidrp]=/usr/lib/nagios/plugins/check_http %s\n" %
-                (config_data['nagios_check_http_params']))
-    if os.path.isfile('/etc/init.d/nagios-nrpe-server'):
-        subprocess.call(['service', 'nagios-nrpe-server', 'reload'])
+    nrpe_compat = NRPE()
+    conf = nrpe_compat.config
+    check_http_params = conf.get('nagios_check_http_params')
+    if check_http_params:
+        nrpe_compat.add_check(
+            shortname='squidrp',
+            description='Check Squid',
+            check_cmd='check_http %s' % check_http_params
+        )
+    config_services_str = conf.get('services', '')
+    config_services = yaml.safe_load(config_services_str) or ()
+    for service in config_services:
+        path = service.get('nrpe_check_path', '/')
+        command = 'check_http -I 127.0.0.1 -p 3128 --method=HEAD '
+        service_name = service['service_name']
+        if conf.get('x_balancer_name_allowed'):
+            command += "-u http://localhost%s -k \\'X-Balancer-Name: %s\\'" % (
+                path, service_name)
+        else:
+            command += '-u http://%s%s' % (service_name, path)
+        nrpe_compat.add_check(
+            shortname='squid-%s' % service_name.replace(".", "_"),
+            description='Check Squid for site %s' % service_name,
+            check_cmd=command,
+        )
+    nrpe_compat.write()
 
 
 ###############################################################################
 # Hook functions
 ###############################################################################
 def install_hook():
-    for f in glob.glob('exec.d/*/charm-pre-install'):
-        if os.path.isfile(f) and os.access(f, os.X_OK):
-            subprocess.check_call(['sh', '-c', f])
     if not os.path.exists(default_squid3_config_dir):
         os.mkdir(default_squid3_config_dir, 0600)
     if not os.path.exists(default_squid3_config_cache_dir):
         os.mkdir(default_squid3_config_cache_dir, 0600)
-    shutil.copy2('%s/files/default.squid3' % (os.environ['CHARM_DIR']), '/etc/default/squid3')
+    shutil.copy2('%s/files/default.squid3' % (
+        os.environ['CHARM_DIR']), '/etc/default/squid3')
     return (apt_get_install(
         "squid3 python-jinja2") == enable_squid3() is not True)
 
 
 def config_changed():
-    current_service_ports = get_service_ports()
+    old_service_ports = get_service_ports()
+    old_sitenames = get_sitenames()
     construct_squid3_config()
     update_nrpe_checks()
 
     if service_squid3("check"):
         updated_service_ports = get_service_ports()
-        update_service_ports(current_service_ports, updated_service_ports)
+        update_service_ports(old_service_ports, updated_service_ports)
         service_squid3("reload")
+        if not (old_sitenames == get_sitenames()):
+            notify_cached_website()
     else:
+        # XXX Ideally the config should be restored to a working state if the
+        # check fails, otherwise an inadvertent reload will cause the service
+        # to be broken.
         sys.exit(1)
 
 
 def start_hook():
     if service_squid3("status"):
-        return(service_squid3("restart"))
+        return service_squid3("restart")
     else:
-        return(service_squid3("start"))
+        return service_squid3("start")
 
 
 def stop_hook():
     if service_squid3("status"):
-        return(service_squid3("stop"))
+        return service_squid3("stop")
 
 
 def website_interface(hook_name=None):
     if hook_name is None:
-        return(None)
-    if hook_name in ["joined", "changed", "broken", "departed"]:
+        return
+    if hook_name in ("joined", "changed", "broken", "departed"):
         config_changed()
 
 
 def cached_website_interface(hook_name=None):
     if hook_name is None:
-        return(None)
-    if hook_name in ["joined", "changed"]:
-        sitenames = ' '.join(get_sitenames())
-        # passing only one port - the first one defined
-        subprocess.call(['relation-set', 'port=%s' % get_service_ports()[0],
-                         'sitenames=%s' % sitenames])
+        return
+    if hook_name in ("joined", "changed"):
+        notify_cached_website(relation_ids=(None,))
+
+
+def get_hostname(host=None):
+    my_host = socket.gethostname()
+    if host is None or host == "0.0.0.0":
+        # If the listen ip has been set to 0.0.0.0 then pass back the hostname
+        return socket.getfqdn(my_host)
+    elif host == "localhost":
+        # If the fqdn lookup has returned localhost (lxc setups) then return
+        # hostname
+        return my_host
+    return host
+
+
+def notify_cached_website(relation_ids=None):
+    hostname = get_hostname()
+    # passing only one port - the first one defined
+    port = get_service_ports()[0]
+    sitenames = ' '.join(get_sitenames())
+
+    for rid in relation_ids or get_relation_ids("cached-website"):
+        relation_set(relation_id=rid, port=port,
+                     hostname=hostname,
+                     sitenames=sitenames)
 
 
 ###############################################################################
 # Main section
 ###############################################################################
-def main():
+def main(hook_name):
     if hook_name == "install":
         install_hook()
     elif hook_name == "config-changed":
@@ -446,14 +454,21 @@
     elif hook_name == "cached-website-relation-departed":
         cached_website_interface("departed")
 
-    elif hook_name == "nrpe-external-master-relation-changed":
+    elif hook_name in ("nrpe-external-master-relation-changed",
+                       "local-monitors-relation-changed"):
         update_nrpe_checks()
 
     elif hook_name == "env-dump":
-        print relation_get_all()
+        print relations_of_type()
     else:
         print "Unknown hook"
         sys.exit(1)
 
 if __name__ == '__main__':
-    main()
+    hook_name = os.path.basename(sys.argv[0])
+    # Also support being invoked directly with hook as argument name.
+    if hook_name == "hooks.py":
+        if len(sys.argv) < 2:
+            sys.exit("Missing required hook name argument.")
+        hook_name = sys.argv[1]
+    main(hook_name)

=== modified symlink 'hooks/install' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2013-04-16 21:22:23 +0000
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -eu
+
+apt_get_install() {
+    DEBIAN_FRONTEND=noninteractive apt-get -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install $1
+}
+
+juju-log 'Invoking charm-pre-install hooks'
+[ -d exec.d ] && ( for f in exec.d/*/charm-pre-install; do [ -x $f ] && /bin/sh -c "$f"; done )
+
+juju-log 'Install dependencies'
+apt_get_install python-software-properties
+
+juju-log 'Add charm tools ppa'
+apt-add-repository -y ppa:ubuntuone/charm-tools
+apt-get -qq update
+
+juju-log 'Install charmsupport and dependencies'
+apt_get_install charm-tools python-charmsupport python-shelltoolbox
+
+juju-log 'Invoking python-based install hook'
+python hooks/hooks.py install

=== added symlink 'hooks/local-monitors-relation-changed'
=== target is u'hooks.py'
=== modified file 'hooks/shelltoolbox/__init__.py'
--- hooks/shelltoolbox/__init__.py	2012-10-02 09:42:19 +0000
+++ hooks/shelltoolbox/__init__.py	2013-04-16 21:22:23 +0000
@@ -603,10 +603,12 @@
     def changed(self):
         return set(key for key in self.intersect
                    if self.past_dict[key] != self.current_dict[key])
+
     @property
     def unchanged(self):
         return set(key for key in self.intersect
                    if self.past_dict[key] == self.current_dict[key])
+
     @property
     def modified(self):
         return self.current_dict != self.past_dict

=== added directory 'hooks/tests'
=== added file 'hooks/tests/__init__.py'
=== added file 'hooks/tests/test_cached_website_hooks.py'
--- hooks/tests/test_cached_website_hooks.py	1970-01-01 00:00:00 +0000
+++ hooks/tests/test_cached_website_hooks.py	2013-04-16 21:22:23 +0000
@@ -0,0 +1,95 @@
+from testtools import TestCase
+from mock import patch, call
+
+import hooks
+
+
+class CachedWebsiteRelationTest(TestCase):
+
+    def setUp(self):
+        super(CachedWebsiteRelationTest, self).setUp()
+        self.notify_cached_website = self.patch_hook("notify_cached_website")
+
+    def patch_hook(self, hook_name):
+        mock_controller = patch.object(hooks, hook_name)
+        mock = mock_controller.start()
+        self.addCleanup(mock_controller.stop)
+        return mock
+
+    def test_website_interface_none(self):
+        self.assertEqual(None, hooks.cached_website_interface(hook_name=None))
+        self.notify_cached_website.assert_not_called()
+
+    def test_website_interface_joined(self):
+        hooks.cached_website_interface(hook_name="joined")
+        self.notify_cached_website.assert_called_once_with(
+            relation_ids=(None,))
+
+    def test_website_interface_changed(self):
+        hooks.cached_website_interface(hook_name="changed")
+        self.notify_cached_website.assert_called_once_with(
+            relation_ids=(None,))
+
+
+class NotifyCachedWebsiteRelationTest(TestCase):
+
+    def setUp(self):
+        super(NotifyCachedWebsiteRelationTest, self).setUp()
+
+        self.get_service_ports = self.patch_hook("get_service_ports")
+        self.get_sitenames = self.patch_hook("get_sitenames")
+        self.get_relation_ids = self.patch_hook("get_relation_ids")
+        self.get_hostname = self.patch_hook("get_hostname")
+        self.relation_set = self.patch_hook("relation_set")
+
+    def patch_hook(self, hook_name):
+        mock_controller = patch.object(hooks, hook_name)
+        mock = mock_controller.start()
+        self.addCleanup(mock_controller.stop)
+        return mock
+
+    def test_notify_cached_website_no_relation_ids(self):
+        self.get_relation_ids.return_value = ()
+
+        hooks.notify_cached_website()
+
+        self.relation_set.assert_not_called()
+        self.get_relation_ids.assert_called_once_with(
+            "cached-website")
+
+    def test_notify_cached_website_with_default_relation(self):
+        self.get_relation_ids.return_value = ()
+        self.get_hostname.return_value = "foo.local"
+        self.get_service_ports.return_value = (3128,)
+        self.get_sitenames.return_value = ("foo.internal", "bar.internal")
+
+        hooks.notify_cached_website(relation_ids=(None,))
+
+        self.get_hostname.assert_called_once_with()
+        self.relation_set.assert_called_once_with(
+            relation_id=None, port=3128,
+            hostname="foo.local",
+            sitenames="foo.internal bar.internal")
+        self.get_relation_ids.assert_not_called()
+
+    def test_notify_cached_website_with_relations(self):
+        self.get_relation_ids.return_value = ("cached-website:1",
+                                              "cached-website:2")
+        self.get_hostname.return_value = "foo.local"
+        self.get_service_ports.return_value = (3128,)
+        self.get_sitenames.return_value = ("foo.internal", "bar.internal")
+
+        hooks.notify_cached_website()
+
+        self.get_hostname.assert_called_once_with()
+        self.get_relation_ids.assert_called_once_with("cached-website")
+        self.relation_set.assert_has_calls([
+            call.relation_set(
+                relation_id="cached-website:1", port=3128,
+                hostname="foo.local",
+                sitenames="foo.internal bar.internal"),
+            call.relation_set(
+                relation_id="cached-website:2", port=3128,
+                hostname="foo.local",
+                sitenames="foo.internal bar.internal"),
+            ])

=== added file 'hooks/tests/test_config_changed_hooks.py'
--- hooks/tests/test_config_changed_hooks.py	1970-01-01 00:00:00 +0000
+++ hooks/tests/test_config_changed_hooks.py	2013-04-16 21:22:23 +0000
@@ -0,0 +1,58 @@
+from testtools import TestCase
+from mock import patch
+
+import hooks
+
+
+class ConfigChangedTest(TestCase):
+
+    def setUp(self):
+        super(ConfigChangedTest, self).setUp()
+        self.get_service_ports = self.patch_hook("get_service_ports")
+        self.get_sitenames = self.patch_hook("get_sitenames")
+        self.construct_squid3_config = self.patch_hook(
+            "construct_squid3_config")
+        self.update_nrpe_checks = self.patch_hook(
+            "update_nrpe_checks")
+        self.update_service_ports = self.patch_hook(
+            "update_service_ports")
+        self.service_squid3 = self.patch_hook(
+            "service_squid3")
+        self.notify_cached_website = self.patch_hook("notify_cached_website")
+
+    def patch_hook(self, hook_name):
+        mock_controller = patch.object(hooks, hook_name)
+        mock = mock_controller.start()
+        self.addCleanup(mock_controller.stop)
+        return mock
+
+    def test_config_changed_notify_cached_website_changed_stanzas(self):
+        self.service_squid3.return_value = True
+        self.get_sitenames.side_effect = (
+            ('foo.internal',),
+            ('foo.internal', 'bar.internal'))
+
+        hooks.config_changed()
+
+        self.notify_cached_website.assert_called_once_with()
+
+    def test_config_changed_no_notify_cached_website_not_changed(self):
+        self.service_squid3.return_value = True
+        self.get_sitenames.side_effect = (
+            ('foo.internal',),
+            ('foo.internal',))
+
+        hooks.config_changed()
+
+        self.notify_cached_website.assert_not_called()
+
+    @patch("sys.exit")
+    def test_config_changed_no_notify_cached_website_failed_check(self, exit):
+        self.service_squid3.return_value = False
+        self.get_sitenames.side_effect = (
+            ('foo.internal',),
+            ('foo.internal', 'bar.internal'))
+
+        hooks.config_changed()
+
+        self.notify_cached_website.assert_not_called()

=== added file 'hooks/tests/test_helpers.py'
--- hooks/tests/test_helpers.py	1970-01-01 00:00:00 +0000
+++ hooks/tests/test_helpers.py	2013-04-16 21:22:23 +0000
@@ -0,0 +1,273 @@
+import os
+from os.path import dirname
+
+from testtools import TestCase
+from testtools.matchers import AfterPreprocessing, Contains
+from mock import patch
+
+import hooks
+from charmsupport.hookenv import Serializable
+
+
+def normalize_whitespace(data):
+    return ' '.join(chunk for chunk in data.split())
+
+
[e-mail](os.environ, {"CHARM_DIR": dirname(dirname(dirname(__file__)))})
+class SquidConfigTest(TestCase):
+
+    def _assert_contents(self, *expected):
+        def side_effect(got):
+            for chunk in expected:
+                self.assertThat(got, AfterPreprocessing(
+                    normalize_whitespace,
+                    Contains(normalize_whitespace(chunk))))
+        return side_effect
+
+    @patch("hooks.write_squid3_config")
+    @patch("hooks.get_relation_sites")
+    @patch("hooks.config_get")
+    def test_squid_config_no_sites(self, config_get, get_relation_sites,
+                                   write_squid3_config):
+        config_get.return_value = Serializable({
+            "refresh_patterns": "",
+            "cache_size_mb": 1024,
+            "target_objs_per_dir": 1024,
+            "avg_obj_size_kb": 1024,
+        })
+        get_relation_sites.return_value = None
+        hooks.construct_squid3_config()
+        write_squid3_config.side_effect = self._assert_contents(
+            """
+            always_direct deny all
+            """,
+            )
+
+    @patch("hooks.write_squid3_config")
+    @patch("hooks.get_relation_sites")
+    @patch("hooks.config_get")
+    def test_squid_config_no_sitenames(self, config_get, get_relation_sites,
+                                       write_squid3_config):
+        config_get.return_value = Serializable({
+            "refresh_patterns": "",
+            "cache_size_mb": 1024,
+            "target_objs_per_dir": 1024,
+            "avg_obj_size_kb": 1024,
+        })
+        get_relation_sites.return_value = {
+            None: [
+                hooks.Server("website_1__foo_1", "1.2.3.4", 4242, ''),
+                hooks.Server("website_1__foo_2", "1.2.3.5", 4242, ''),
+                ],
+            }
+        write_squid3_config.side_effect = self._assert_contents(
+            """
+            acl no_sitename_acl myport
+            http_access allow accel_ports no_sitename_acl
+            never_direct allow no_sitename_acl
+            """,
+            """
+            cache_peer 1.2.3.4 parent 4242 0 name=website_1__foo_1 no-query
+            no-digest originserver round-robin login=PASS
+            cache_peer_access website_1__foo_1 allow no_sitename_acl
+            cache_peer_access website_1__foo_1 deny all
+            """,
+            """
+            cache_peer 1.2.3.5 parent 4242 0 name=website_1__foo_2 no-query
+            no-digest originserver round-robin login=PASS
+            cache_peer_access website_1__foo_2 allow no_sitename_acl
+            cache_peer_access website_1__foo_2 deny all
+            """
+            )
+        hooks.construct_squid3_config()
+
+    @patch("hooks.write_squid3_config")
+    @patch("hooks.get_relation_sites")
+    @patch("hooks.config_get")
+    def test_squid_config_with_domain(self, config_get, get_relation_sites,
+                                      write_squid3_config):
+        config_get.return_value = Serializable({
+            "refresh_patterns": "",
+            "cache_size_mb": 1024,
+            "target_objs_per_dir": 1024,
+            "avg_obj_size_kb": 1024,
+        })
+        get_relation_sites.return_value = {
+            "foo.com": [
+                hooks.Server("foo_com__website_1__foo_1",
+                             "1.2.3.4", 4242, "forceddomain=example.com"),
+                hooks.Server("foo_com__website_1__foo_2",
+                             "1.2.3.5", 4242, "forceddomain=example.com"),
+                ],
+            }
+        write_squid3_config.side_effect = self._assert_contents(
+            """
+            acl s_1_acl dstdomain foo.com
+            http_access allow accel_ports s_1_acl
+            http_access allow CONNECT SSL_ports s_1_acl
+            always_direct allow SSL_ports s_1_acl
+            never_direct allow s_1_acl
+            """,
+            """
+            cache_peer 1.2.3.4 parent 4242 0 name=foo_com__website_1__foo_1
+            no-query no-digest originserver round-robin login=PASS
+            forceddomain=example.com
+            cache_peer_access foo_com__website_1__foo_1 allow s_1_acl
+            cache_peer_access foo_com__website_1__foo_1 deny all
+            """,
+            """
+            cache_peer 1.2.3.5 parent 4242 0 name=foo_com__website_1__foo_2
+            no-query no-digest originserver round-robin login=PASS
+            forceddomain=example.com
+            cache_peer_access foo_com__website_1__foo_2 allow s_1_acl
+            cache_peer_access foo_com__website_1__foo_2 deny all
+            """
+            )
+        hooks.construct_squid3_config()
+
+    @patch("hooks.write_squid3_config")
+    @patch("hooks.get_relation_sites")
+    @patch("hooks.config_get")
+    def test_with_domain_no_servers_only_direct(self, config_get,
+                                                get_relation_sites,
+                                                write_squid3_config):
+        config_get.return_value = Serializable({
+            "refresh_patterns": "",
+            "cache_size_mb": 1024,
+            "target_objs_per_dir": 1024,
+            "avg_obj_size_kb": 1024,
+        })
+        get_relation_sites.return_value = {
+            "foo.com": [
+                ],
+            }
+        write_squid3_config.side_effect = self._assert_contents(
+            """
+            acl s_1_acl dstdomain foo.com
+            http_access allow accel_ports s_1_acl
+            http_access allow CONNECT SSL_ports s_1_acl
+            always_direct allow s_1_acl
+            """,
+            )
+        hooks.construct_squid3_config()
+
+    @patch("hooks.write_squid3_config")
+    @patch("hooks.get_relation_sites")
+    @patch("hooks.config_get")
+    def test_with_balancer_no_servers_only_direct(self, config_get,
+                                                  get_relation_sites,
+                                                  write_squid3_config):
+        config_get.return_value = Serializable({
+            "refresh_patterns": "",
+            "cache_size_mb": 1024,
+            "target_objs_per_dir": 1024,
+            "avg_obj_size_kb": 1024,
+            "x_balancer_name_allowed": True,
+        })
+        get_relation_sites.return_value = {
+            "foo.com": [
+                ],
+            }
+        write_squid3_config.side_effect = self._assert_contents(
+            """
+            acl s_1_acl dstdomain foo.com
+            http_access allow accel_ports s_1_acl
+            http_access allow CONNECT SSL_ports s_1_acl
+            always_direct allow s_1_acl
+            """,
+            """
+            acl s_1_balancer req_header X-Balancer-Name foo\.com
+            http_access allow accel_ports s_1_balancer
+            http_access allow CONNECT SSL_ports s_1_balancer
+            always_direct allow s_1_balancer
+            """,
+            )
+        hooks.construct_squid3_config()
+
+    @patch("hooks.write_squid3_config")
+    @patch("hooks.get_relation_sites")
+    @patch("hooks.config_get")
+    def test_with_balancer_name(self, config_get, get_relation_sites,
+                                write_squid3_config):
+        config_get.return_value = Serializable({
+            "refresh_patterns": "",
+            "cache_size_mb": 1024,
+            "target_objs_per_dir": 1024,
+            "avg_obj_size_kb": 1024,
+            "x_balancer_name_allowed": True,
+            })
+        get_relation_sites.return_value = {
+            "foo.com": [
+                hooks.Server("foo_com__website_1__foo_1",
+                             "1.2.3.4", 4242, ''),
+                hooks.Server("foo_com__website_1__foo_2",
+                             "1.2.3.5", 4242, ''),
+                ],
+            }
+        write_squid3_config.side_effect = self._assert_contents(
+            """
+            acl s_1_acl dstdomain foo.com
+            http_access allow accel_ports s_1_acl
+            http_access allow CONNECT SSL_ports s_1_acl
+            always_direct allow SSL_ports s_1_acl
+            never_direct allow s_1_acl
+            """,
+            """
+            acl s_1_balancer req_header X-Balancer-Name foo\.com
+            http_access allow accel_ports s_1_balancer
+            http_access allow CONNECT SSL_ports s_1_balancer
+            always_direct allow SSL_ports s_1_balancer
+            never_direct allow s_1_balancer
+            """,
+            """
+            cache_peer 1.2.3.4 parent 4242 0 name=foo_com__website_1__foo_1
+            no-query no-digest originserver round-robin login=PASS
+            cache_peer_access foo_com__website_1__foo_1 allow s_1_acl
+            cache_peer_access foo_com__website_1__foo_1 allow s_1_balancer
+            cache_peer_access foo_com__website_1__foo_1 deny all
+            """,
+            """
+            cache_peer 1.2.3.5 parent 4242 0 name=foo_com__website_1__foo_2
+            no-query no-digest originserver round-robin login=PASS
+            cache_peer_access foo_com__website_1__foo_2 allow s_1_acl
+            """
+            )
+        hooks.construct_squid3_config()
+
+
+class HelpersTest(TestCase):
+    def test_gets_config(self):
+        json_string = '{"foo": "BAR"}'
+        with patch('subprocess.check_output') as check_output:
+            check_output.return_value = json_string
+
+            result = hooks.config_get()
+
+            self.assertEqual(result['foo'], 'BAR')
+            check_output.assert_called_with(['config-get', '--format=json'])
+
+    def test_gets_config_with_scope(self):
+        json_string = '{"foo": "BAR"}'
+        with patch('subprocess.check_output') as check_output:
+            check_output.return_value = json_string
+
+            result = hooks.config_get(scope='baz')
+
+            self.assertEqual(result['foo'], 'BAR')
+            check_output.assert_called_with(['config-get', 'baz',
+                                             '--format=json'])
+
+    @patch('subprocess.call')
+    def test_installs_packages(self, mock_call):
+        mock_call.return_value = 'some result'
+
+        result = hooks.apt_get_install('foo bar')
+
+        self.assertEqual(result, 'some result')
+        mock_call.assert_called_with(['apt-get', '-y', 'install', '-qq',
+                                      'foo', 'bar'])
+
+    @patch('subprocess.call')
+    def test_installs_nothing_if_package_not_provided(self, mock_call):
+        self.assertFalse(hooks.apt_get_install())
+        self.assertFalse(mock_call.called)

=== added file 'hooks/tests/test_nrpe_hooks.py'
--- hooks/tests/test_nrpe_hooks.py	1970-01-01 00:00:00 +0000
+++ hooks/tests/test_nrpe_hooks.py	2013-04-16 21:22:23 +0000
@@ -0,0 +1,217 @@
+import os
+import grp
+import pwd
+import subprocess
+from testtools import TestCase
+from mock import patch, call
+
+import hooks
+from charmsupport import nrpe
+from charmsupport.hookenv import Serializable
+
+
+class NRPERelationTest(TestCase):
+    """Tests for the update_nrpe_checks hook.
+
+    Half of this is already tested in the tests for charmsupport.nrpe, but
+    as the hook in the charm pre-dates that, the tests are left here to ensure
+    backwards-compatibility.
+
+    """
+    patches = {
+        'config': {'object': nrpe},
+        'log': {'object': nrpe},
+        'getpwnam': {'object': pwd},
+        'getgrnam': {'object': grp},
+        'mkdir': {'object': os},
+        'chown': {'object': os},
+        'exists': {'object': os.path},
+        'listdir': {'object': os},
+        'remove': {'object': os},
+        'open': {'object': nrpe, 'create': True},
+        'isfile': {'object': os.path},
+        'call': {'object': subprocess},
+        'relation_ids': {'object': nrpe},
+        'relation_set': {'object': nrpe},
+    }
+
+    def setUp(self):
+        super(NRPERelationTest, self).setUp()
+        self.patched = {}
+        # Mock the universe.
+        for attr, data in self.patches.items():
+            create = data.get('create', False)
+            patcher = patch.object(data['object'], attr, create=create)
+            self.patched[attr] = patcher.start()
+            self.addCleanup(patcher.stop)
+        if not 'JUJU_UNIT_NAME' in os.environ:
+            os.environ['JUJU_UNIT_NAME'] = 'test'
+
+    def check_call_counts(self, **kwargs):
+        for attr, expected in kwargs.items():
+            patcher = self.patched[attr]
+            self.assertEqual(expected, patcher.call_count, attr)
+
+    def test_update_nrpe_no_nagios_bails(self):
+        config = {'nagios_context': 'test'}
+        self.patched['config'].return_value = Serializable(config)
+        self.patched['getpwnam'].side_effect = KeyError
+
+        self.assertEqual(None, hooks.update_nrpe_checks())
+
+        expected = 'Nagios user not set up, nrpe checks not updated'
+        self.patched['log'].assert_called_once_with(expected)
+        self.check_call_counts(log=1, config=1, getpwnam=1)
+
+    def test_update_nrpe_removes_existing_config(self):
+        config = {
+            'nagios_context': 'test',
+            'nagios_check_http_params': '-u http://example.com/url',
+        }
+        self.patched['config'].return_value = Serializable(config)
+        self.patched['exists'].return_value = True
+        self.patched['listdir'].return_value = [
+            'foo', 'bar.cfg', 'check_squidrp.cfg']
+
+        self.assertEqual(None, hooks.update_nrpe_checks())
+
+        expected = '/var/lib/nagios/export/check_squidrp.cfg'
+        self.patched['remove'].assert_called_once_with(expected)
+        self.check_call_counts(config=1, getpwnam=1, getgrnam=1,
+                               exists=4, remove=1, open=2, listdir=1)
+
+    def test_update_nrpe_with_check_url(self):
+        config = {
+            'nagios_context': 'test',
+            'nagios_check_http_params': '-u foo -H bar',
+        }
+        self.patched['config'].return_value = Serializable(config)
+        self.patched['exists'].return_value = True
+        self.patched['isfile'].return_value = False
+
+        self.assertEqual(None, hooks.update_nrpe_checks())
+        self.assertEqual(2, self.patched['open'].call_count)
+        filename = 'check_squidrp.cfg'
+
+        service_file_contents = """
+#---------------------------------------------------
+# This file is Juju managed
+#---------------------------------------------------
+define service {
+    use                             active-service
+    host_name                       test-test
+    service_description             test-test[squidrp] Check Squid
+    check_command                   check_nrpe!check_squidrp
+    servicegroups                   test
+}
+"""
+        self.patched['open'].assert_has_calls(
+            [call('/etc/nagios/nrpe.d/%s' % filename, 'w'),
+             call('/var/lib/nagios/export/service__test-test_%s' %
+                  filename, 'w'),
+             call().__enter__().write(service_file_contents),
+             call().__enter__().write('# check squidrp\n'),
+             call().__enter__().write(
+                 'command[check_squidrp]=/check_http -u foo -H bar\n')],
+            any_order=True)
+
+        self.check_call_counts(config=1, getpwnam=1, getgrnam=1,
+                               exists=4, open=2, listdir=1)
+
+    def test_update_nrpe_with_services_and_host_header(self):
+        config = {
+            'nagios_context': 'test',
+            'services': '- {service_name: i_ytimg_com}',
+        }
+        self.patched['config'].return_value = Serializable(config)
+        self.patched['exists'].return_value = True
+
+        self.assertEqual(None, hooks.update_nrpe_checks())
+
+        self.check_call_counts(config=1, getpwnam=1, getgrnam=1,
+                               exists=4, open=2, listdir=1)
+        expected = ('command[check_squid-i_ytimg_com]=/check_http '
+                    '-I 127.0.0.1 -p 3128 --method=HEAD '
+                    '-u http://i_ytimg_com/\n')
+        self.patched['open'].assert_has_calls(
+            [call('/etc/nagios/nrpe.d/check_squid-i_ytimg_com.cfg', 'w'),
+             call().__enter__().write(expected)],
+            any_order=True)
+
+    def test_update_nrpe_with_dotted_service_name_and_host_header(self):
+        config = {
+            'nagios_context': 'test',
+            'services': '- {service_name: i.ytimg.com}',
+        }
+        self.patched['config'].return_value = Serializable(config)
+        self.patched['exists'].return_value = True
+
+        self.assertEqual(None, hooks.update_nrpe_checks())
+
+        self.check_call_counts(config=1, getpwnam=1, getgrnam=1,
+                               exists=4, open=2, listdir=1)
+        expected = ('command[check_squid-i_ytimg_com]=/check_http '
+                    '-I 127.0.0.1 -p 3128 --method=HEAD '
+                    '-u http://i.ytimg.com/\n')
+        self.patched['open'].assert_has_calls(
+            [call('/etc/nagios/nrpe.d/check_squid-i_ytimg_com.cfg', 'w'),
+             call().__enter__().write(expected)],
+            any_order=True)
+
+    def test_update_nrpe_with_services_and_balancer_name_header(self):
+        config = {
+            'nagios_context': 'test',
+            'x_balancer_name_allowed': True,
+            'services': '- {service_name: i_ytimg_com}',
+        }
+        self.patched['config'].return_value = Serializable(config)
+        self.patched['exists'].return_value = True
+
+        self.assertEqual(None, hooks.update_nrpe_checks())
+
+        self.check_call_counts(config=1, getpwnam=1, getgrnam=1,
+                               exists=4, open=2, listdir=1)
+
+        expected = ('command[check_squid-i_ytimg_com]=/check_http '
+                    '-I 127.0.0.1 -p 3128 --method=HEAD -u http://localhost/ '
+                    "-k 'X-Balancer-Name: i_ytimg_com'\n")
+        self.patched['open'].assert_has_calls(
+            [call('/etc/nagios/nrpe.d/check_squid-i_ytimg_com.cfg', 'w'),
+             call().__enter__().write(expected)],
+            any_order=True)
+
+    def test_update_nrpe_with_services_and_optional_path(self):
+        services = '- {nrpe_check_path: /foo.jpg, service_name: foo_com}\n'
+        config = {
+            'nagios_context': 'test',
+            'services': services,
+        }
+        self.patched['config'].return_value = Serializable(config)
+        self.patched['exists'].return_value = True
+
+        self.assertEqual(None, hooks.update_nrpe_checks())
+
+        self.check_call_counts(config=1, getpwnam=1, getgrnam=1,
+                               exists=4, open=2, listdir=1)
+        expected = ('command[check_squid-foo_com]=/check_http '
+                    '-I 127.0.0.1 -p 3128 --method=HEAD '
+                    '-u http://foo_com/foo.jpg\n')
+        self.patched['open'].assert_has_calls(
+            [call('/etc/nagios/nrpe.d/check_squid-foo_com.cfg', 'w'),
+             call().__enter__().write(expected)],
+            any_order=True)
+
+    def test_update_nrpe_restarts_service(self):
+        config = {
+            'nagios_context': 'test',
+            'nagios_check_http_params': '-u foo -p 3128'
+        }
+        self.patched['config'].return_value = Serializable(config)
+        self.patched['exists'].return_value = True
+
+        self.assertEqual(None, hooks.update_nrpe_checks())
+
+        expected = ['initctl', 'restart', 'nagios-nrpe-server']
+        self.assertEqual(expected, self.patched['call'].call_args[0][0])
+        self.check_call_counts(config=1, getpwnam=1, getgrnam=1,
+                               exists=4, open=2, listdir=1, call=1)

=== added file 'hooks/tests/test_website_hooks.py'
--- hooks/tests/test_website_hooks.py	1970-01-01 00:00:00 +0000
+++ hooks/tests/test_website_hooks.py	2013-04-16 21:22:23 +0000
@@ -0,0 +1,267 @@
+import yaml
+
+from testtools import TestCase
+from mock import patch
+
+import hooks
+from charmsupport.hookenv import Serializable
+
+
+class WebsiteRelationTest(TestCase):
+
+    def setUp(self):
+        super(WebsiteRelationTest, self).setUp()
+
+        relations_of_type = patch.object(hooks, "relations_of_type")
+        self.relations_of_type = relations_of_type.start()
+        self.addCleanup(relations_of_type.stop)
+
+        config_get = patch.object(hooks, "config_get")
+        self.config_get = config_get.start()
+        self.addCleanup(config_get.stop)
+
+        log = patch.object(hooks, "log")
+        self.log = log.start()
+        self.addCleanup(log.stop)
+
+    def test_relation_data_returns_no_relations(self):
+        self.config_get.return_value = Serializable({})
+        self.relations_of_type.return_value = []
+        self.assertEqual(None, hooks.get_relation_sites())
+
+    def test_no_port_in_relation_data(self):
+        self.config_get.return_value = Serializable({})
+        self.relations_of_type.return_value = [
+            {"private-address": "1.2.3.4",
+             "__unit__": "foo/1",
+             "__relid__": "website:1"},
+            ]
+        self.assertIs(None, hooks.get_relation_sites())
+        self.log.assert_called_once_with(
+            "No port in relation data for 'foo/1', skipping.")
+
+    def test_empty_relation_services(self):
+        self.config_get.return_value = Serializable({})
+        self.relations_of_type.return_value = [
+            {"private-address": "1.2.3.4",
+             "__unit__": "foo/1",
+             "__relid__": "website:1",
+             "all_services": "",
+             },
+            ]
+
+        self.assertEqual(None, hooks.get_relation_sites())
+        self.log.assert_not_called()
+
+    def test_no_port_in_relation_data_ok_with_all_services(self):
+        self.config_get.return_value = Serializable({})
+        self.relations_of_type.return_value = [
+            {"private-address": "1.2.3.4",
+             "__unit__": "foo/1",
+             "__relid__": "website:1",
+             "all_services": yaml.dump([
+                 {"service_name": "foo.internal",
+                  "service_port": 4242},
+                 ]),
+             },
+            ]
+
+        expected = {
+            "foo.internal": [
+                ("foo_internal__website_1__foo_1", "1.2.3.4", 4242, ''),
+                ],
+            }
+        self.assertEqual(expected, hooks.get_relation_sites())
+        self.log.assert_not_called()
+
+    def test_no_private_address_in_relation_data(self):
+        self.config_get.return_value = Serializable({})
+        self.relations_of_type.return_value = [
+            {"port": 4242,
+             "__unit__": "foo/0",
+             "__relid__": "website:1",
+             },
+            ]
+        self.assertIs(None, hooks.get_relation_sites())
+        self.log.assert_called_once_with(
+            "No private-address in relation data for 'foo/0', skipping.")
+
+    def test_sitenames_in_relation_data(self):
+        self.config_get.return_value = Serializable({})
+        self.relations_of_type.return_value = [
+            {"private-address": "1.2.3.4",
+             "port": 4242,
+             "__unit__": "foo/1",
+             "__relid__": "website:1",
+             "sitenames": "foo.internal bar.internal"},
+            {"private-address": "1.2.3.5",
+             "port": 4242,
+             "__unit__": "foo/2",
+             "__relid__": "website:1",
+             "sitenames": "foo.internal bar.internal"},
+            ]
+        expected = {
+            "foo.internal": [
+                ("foo_internal__website_1__foo_1", "1.2.3.4", 4242, ''),
+                ("foo_internal__website_1__foo_2", "1.2.3.5", 4242, ''),
+                ],
+            "bar.internal": [
+                ("bar_internal__website_1__foo_1", "1.2.3.4", 4242, ''),
+                ("bar_internal__website_1__foo_2", "1.2.3.5", 4242, ''),
+                ],
+            }
+        self.assertEqual(expected, hooks.get_relation_sites())
+
+    def test_all_services_in_relation_data(self):
+        self.config_get.return_value = Serializable({})
+        self.relations_of_type.return_value = [
+            {"private-address": "1.2.3.4",
+             "__unit__": "foo/1",
+             "__relid__": "website:1",
+             "all_services": yaml.dump([
+                 {"service_name": "foo.internal",
+                  "service_port": 4242},
+                 {"service_name": "bar.internal",
+                  "service_port": 4243}
+                 ]),
+             },
+            {"private-address": "1.2.3.5",
+             "__unit__": "foo/2",
+             "__relid__": "website:1",
+             "all_services": yaml.dump([
+                 {"service_name": "foo.internal",
+                  "service_port": 4242},
+                 {"service_name": "bar.internal",
+                  "service_port": 4243}
+                 ]),
+             },
+            ]
+        expected = {
+            "foo.internal": [
+                ("foo_internal__website_1__foo_1", "1.2.3.4", 4242, ''),
+                ("foo_internal__website_1__foo_2", "1.2.3.5", 4242, ''),
+                ],
+            "bar.internal": [
+                ("bar_internal__website_1__foo_1", "1.2.3.4", 4243, ''),
+                ("bar_internal__website_1__foo_2", "1.2.3.5", 4243, ''),
+                ],
+            }
+        self.assertEqual(expected, hooks.get_relation_sites())
+
+    def test_unit_names_in_relation_data(self):
+        self.config_get.return_value = Serializable({})
+        self.relations_of_type.return_value = [
+            {"private-address": "1.2.3.4",
+             "__relid__": "website_1",
+             "__unit__": "foo/1",
+             "port": 4242},
+            {"private-address": "1.2.3.5",
+             "__relid__": "website_1",
+             "__unit__": "foo/2",
+             "port": 4242},
+            ]
+        expected = {
+            None: [
+                ("website_1__foo_1", "1.2.3.4", 4242, ''),
+                ("website_1__foo_2", "1.2.3.5", 4242, ''),
+                ],
+            }
+        self.assertEqual(expected, hooks.get_relation_sites())
+
+    def test_sites_from_config_no_domain(self):
+        self.relations_of_type.return_value = []
+        self.config_get.return_value = Serializable({
+            "services": yaml.dump([
+                {"service_name": "foo.internal",
+                 "servers": [
+                     ["1.2.3.4", 4242],
+                     ["1.2.3.5", 4242],
+                     ]
+                 }
+                ])})
+        expected = {
+            "foo.internal": [
+                ("foo_internal__1_2_3_4", "1.2.3.4", 4242, ''),
+                ("foo_internal__1_2_3_5", "1.2.3.5", 4242, ''),
+                ],
+            }
+        self.assertEqual(expected, hooks.get_relation_sites())
+
+    def test_sites_from_config_with_domain(self):
+        self.relations_of_type.return_value = []
+        self.config_get.return_value = Serializable({
+            "services": yaml.dump([
+                {"service_name": "foo.internal",
+                 "server_options": ["forceddomain=example.com"],
+                 "servers": [
+                     ["1.2.3.4", 4242],
+                     ["1.2.3.5", 4242],
+                     ]
+                 }
+                ])})
+        expected = {
+            "foo.internal": [
+                ("foo_internal__1_2_3_4", "1.2.3.4", 4242,
+                 "forceddomain=example.com"),
+                ("foo_internal__1_2_3_5", "1.2.3.5", 4242,
+                 "forceddomain=example.com"),
+                ],
+            }
+        self.assertEqual(expected, hooks.get_relation_sites())
+
+    def test_sites_from_config_and_relation_with_domain(self):
+        self.relations_of_type.return_value = [
+            {"private-address": "1.2.3.4",
+             "__unit__": "foo/1",
+             "__relid__": "website:1",
+             "all_services": yaml.dump([
+                 {"service_name": "foo.internal",
+                  "service_port": 4242},
+                 {"service_name": "bar.internal",
+                  "service_port": 4243}
+                 ]),
+             },
+            {"private-address": "1.2.3.5",
+             "__unit__": "foo/2",
+             "__relid__": "website:1",
+             "all_services": yaml.dump([
+                 {"service_name": "foo.internal",
+                  "service_port": 4242},
+                 {"service_name": "bar.internal",
+                  "service_port": 4243}
+                 ]),
+             },
+            ]
+        self.config_get.return_value = Serializable({
+            "services": yaml.dump([
+                {"service_name": "foo.internal",
+                 "server_options": ["forceddomain=example.com"],
+                 "servers": [
+                     ["1.2.4.4", 4242],
+                     ["1.2.4.5", 4242],
+                     ]
+                 }
+                ])})
+        expected = {
+            "foo.internal": [
+                ("foo_internal__1_2_4_4", "1.2.4.4", 4242,
+                 "forceddomain=example.com"),
+                ("foo_internal__1_2_4_5", "1.2.4.5", 4242,
+                 "forceddomain=example.com"),
+                ("foo_internal__website_1__foo_1", "1.2.3.4", 4242,
+                 "forceddomain=example.com"),
+                ("foo_internal__website_1__foo_2", "1.2.3.5", 4242,
+                 "forceddomain=example.com"),
+                ],
+            "bar.internal": [
+                ("bar_internal__website_1__foo_1", "1.2.3.4", 4243, ''),
+                ("bar_internal__website_1__foo_2", "1.2.3.5", 4243, ''),
+                ],
+            }
+        self.assertEqual(expected, hooks.get_relation_sites())
+
+    def test_empty_sites_from_config_no_domain(self):
+        self.relations_of_type.return_value = []
+        self.config_get.return_value = Serializable({
+            "services": ""})
+        self.assertEqual(None, hooks.get_relation_sites())

=== added directory 'lib'
=== modified file 'metadata.yaml'
--- metadata.yaml	2013-01-11 16:56:09 +0000
+++ metadata.yaml	2013-04-16 21:22:23 +0000
@@ -1,6 +1,6 @@
 name: squid-reverseproxy
 summary: Full featured Web Proxy cache (HTTP proxy)
-maintainer: "Matthew Wedgwood <[e-mail]>"
+maintainer: [Matthew Wedgwood <[e-mail]>, Alexander List <[e-mail]>]
 description: >
   Squid is a high-performance proxy caching server for web clients,
   supporting FTP, gopher, and HTTP data objects.  Squid version 3 is a
@@ -21,6 +21,12 @@
   nrpe-external-master:
     interface: nrpe-external-master
     scope: container
+  nrpe-external-master:
+    interface: nrpe-external-master
+    scope: container
+  local-monitors:
+    interface: local-monitors
+    scope: container
 requires:
   website:
     interface: http

=== removed file 'revision'
--- revision	2013-02-15 07:04:29 +0000
+++ revision	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-0

=== added file 'setup.cfg'
--- setup.cfg	1970-01-01 00:00:00 +0000
+++ setup.cfg	2013-04-16 21:22:23 +0000
@@ -0,0 +1,4 @@
+[nosetests]
+with-coverage=1
+cover-erase=1
+cover-package=hooks
\ No newline at end of file

=== added file 'tarmac_tests.sh'
--- tarmac_tests.sh	1970-01-01 00:00:00 +0000
+++ tarmac_tests.sh	2013-04-16 21:22:23 +0000
@@ -0,0 +1,6 @@
+#!/bin/sh
+# How the tests are run in Jenkins by Tarmac
+
+set -e
+
+make build

=== modified file 'templates/main_config.template'
--- templates/main_config.template	2013-01-11 16:50:54 +0000
+++ templates/main_config.template	2013-04-16 21:22:23 +0000
@@ -1,10 +1,11 @@
-http_port {{ config.port }}  accel vport=443
+http_port {{ config.port }} {{ config.port_options }}
 
 acl manager proto cache_object
 acl localhost src 127.0.0.1/32
 acl to_localhost dst 127.0.0.0/8
 acl PURGE method PURGE
 acl CONNECT method CONNECT
+acl SSL_ports port 443
 
 {% if config.snmp_community -%}
 acl snmp_access snmp_community {{ config.snmp_community }}
@@ -37,16 +38,40 @@
 {% for rp in refresh_patterns.keys() -%}
 refresh_pattern {{ rp }} {{ refresh_patterns[rp]['min'] }} {{ refresh_patterns[rp]['percent'] }}% {{ refresh_patterns[rp]['max'] }}
 {% endfor -%}
-refresh_pattern .               30      20%     4320
-
-{% for relid in relations.keys() -%}
-{% for sitename in relations[relid].sitenames -%}
-acl {{ relations[relid].name }}_acl dstdomain {{ sitename }}
-{% else -%}
-acl {{ relations[relid].name }}_acl myport {{ config.port }}
-{% endfor -%}
-http_access allow accel_ports {{ relations[relid].name }}_acl
-{% endfor -%}
+refresh_pattern . {{default_refresh_pattern.min}} {{default_refresh_pattern.percent}}% {{default_refresh_pattern.max}}
+
+{% if sites -%}
+{% for sitename in sites.keys() -%}
+{% if sitename -%}
+acl s_{{ loop.index }}_acl dstdomain {{ sitename }}
+http_access allow accel_ports s_{{ loop.index }}_acl
+http_access allow CONNECT SSL_ports s_{{ loop.index }}_acl
+{% if sitename in only_direct -%}
+always_direct allow s_{{ loop.index }}_acl
+{% else -%}
+always_direct allow SSL_ports s_{{ loop.index }}_acl
+never_direct allow s_{{ loop.index }}_acl
+{% endif -%}
+
+{% if config['x_balancer_name_allowed'] -%}
+acl s_{{ loop.index }}_balancer req_header X-Balancer-Name {{ sitename.replace('.', '\.') }}
+http_access allow accel_ports s_{{ loop.index }}_balancer
+http_access allow CONNECT SSL_ports s_{{ loop.index }}_balancer
+{% if sitename in only_direct -%}
+always_direct allow s_{{ loop.index }}_balancer
+{% else -%}
+always_direct allow SSL_ports s_{{ loop.index }}_balancer
+never_direct allow s_{{ loop.index }}_balancer
+{% endif -%}
+{% endif -%}
+
+{% else -%}
+acl no_sitename_acl myport {{ config.port }}
+http_access allow accel_ports no_sitename_acl
+never_direct allow no_sitename_acl
+{% endif -%}
+{% endfor -%}
+{% endif -%}
 
 http_access allow manager localhost
 http_access deny manager
@@ -57,11 +82,24 @@
 http_access deny accel_ports all
 http_access deny all
 icp_access deny all
+always_direct deny all
 
-{% for relid in relations -%}
-{% if relations[relid].port -%}
-cache_peer {{ relations[relid]['private-address'] }} parent {{ relations[relid].port }} 0 name={{ relations[relid].name }} no-query no-digest originserver round-robin login=PASS
-cache_peer_access {{ relations[relid].name }} allow {{ relations[relid].name }}_acl
-cache_peer_access {{ relations[relid].name }} deny !{{ relations[relid].name }}_acl
-{% endif -%}
-{% endfor -%}
+{% if sites -%}
+{% for sitename in sites.keys() -%}
+{% set sites_loop = loop %}
+{% for peer in sites[sitename] -%}
+{% if sitename -%}
+cache_peer {{ peer.address }} parent {{ peer.port }} 0 name={{ peer.name }} no-query no-digest originserver round-robin login=PASS {{ peer.options }}
+cache_peer_access {{ peer.name }} allow s_{{ sites_loop.index }}_acl
+{% if config['x_balancer_name_allowed'] -%}
+cache_peer_access {{ peer.name }} allow s_{{ sites_loop.index }}_balancer
+{% endif -%}
+cache_peer_access {{ peer.name }} deny all
+{% else %}
+cache_peer {{ peer.address }} parent {{ peer.port }} 0 name={{ peer.name }} no-query no-digest originserver round-robin login=PASS
+cache_peer_access {{ peer.name }} allow no_sitename_acl
+cache_peer_access {{ peer.name }} deny all
+{% endif -%}
+{% endfor -%}
+{% endfor -%}
+{% endif -%}