Merge lp:~dpb/charms/precise/apache2/reverseproxy-move into lp:charms/apache2

[David Britton]

- move reverseproxy to a "requires" relation. This matches what haproxy would expect allowing you to have something like this:

  apache2:reverseproxy <=> haproxy:website ... haproxy:reverseproxy <=> application:website

I realize that the provides and requires thing is largely convention, but this one seems like it's in the wrong place, especially when viewed through the light of haproxy (which the README.md already mentions).

- small fix to sanitize service names (strip out non-python-variable-characters from service names) as was done for the unit names. Jinja2 requires this, and the README.md had already been updated to reflect this.

[Mark Mims (mark-mims)]

apache2 still needs to provide an http interface (perhaps "website") so that it can sit _behind_ a reverse-proxy

review: Needs Fixing

[David Britton (dpb)]

There is a "website" relation in hooks.py. I see in revision 21 it was removed from the metadata file and the hook symlinks were deleted:

  "Also removed website relation as it isn't used to make charm proof happy."

As the code was still in hooks.py, and it doesn't appear wrong, I put those back in.

[Mark Mims (mark-mims)]

one fix I'll add on top, but otherwise lgtm

[Mark Mims (mark-mims)]

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-02-08 21:59:00 +0000
+++ hooks/hooks.py	2013-02-12 22:33:19 +0000
@@ -297,6 +297,7 @@
                 service_name = service_item['service_name']
                 service_port = service_item['service_port']
                 service_key = '%s_%s' % (unit_type, service_name)
+                service_key = re.sub('[^a-zA-Z0-9_]*', '', service_key)
                 reverseproxy_data[service_key] = '%s:%s' % (host, service_port)
     relation_data.update(reverseproxy_data)
     return relation_data

=== modified file 'metadata.yaml'
--- metadata.yaml	2013-01-29 17:31:09 +0000
+++ metadata.yaml	2013-02-12 22:33:19 +0000
@@ -9,12 +9,12 @@
   IPv6, easy scripting and database integration, request/response
   filtering, many flexible authentication schemes, and more.
 provides:
-  reverseproxy:
-    interface: http
   nrpe-external-master:
     interface: nrpe-external-master
     scope: container
 requires:
+  reverseproxy:
+    interface: http
   website-cache:
     interface: http
   balancer:

=== modified file 'revision'
--- revision	2013-02-01 23:05:11 +0000
+++ revision	2013-02-12 22:33:19 +0000
@@ -1,1 +1,1 @@
-2
+4