Merge lp:~cmars/sharinfoo/haproxy-relation into lp:sharinfoo

[Casey Marshall]

Add website relation for reverse proxying with haproxy charm.

Add website relation for reverse proxying with haproxy charm.

[Casey Marshall (cmars)]

To test with haproxy charm:

1. juju deploy sharinfoo
2. juju deploy haproxy
3. juju add-relation sharinfoo:website haproxy:reverseproxy

[Andrew W. Deane (andrew-w-deane)]

review: Approve

[Matthew Williams (mattyw)]

review: Approve

=== added file 'charms/precise/sharinfoo/hooks/website-relation-changed'
--- charms/precise/sharinfoo/hooks/website-relation-changed	1970-01-01 00:00:00 +0000
+++ charms/precise/sharinfoo/hooks/website-relation-changed	2014-01-13 17:21:51 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+host=$(unit-get private-address)
+
+relation-set "services=
+- { service_name: sharinfoo,
+    service_host: 0.0.0.0,
+    service_port: 8080,
+    service_options: [mode http],
+    servers: [[sharinfoo, $host, 8080, '']],
+    server_options: weight 1 maxconn 1024 check inter 10000 }
+"

=== modified file 'charms/precise/sharinfoo/metadata.yaml'
--- charms/precise/sharinfoo/metadata.yaml	2014-01-07 21:44:54 +0000
+++ charms/precise/sharinfoo/metadata.yaml	2014-01-13 17:21:51 +0000
@@ -7,5 +7,5 @@
 categories:
  - applications
 provides:
-  fileserver:
-    interface: shfoo
+  website:
+    interface: http

=== modified file 'charms/precise/sharinfoo/revision'
--- charms/precise/sharinfoo/revision	2014-01-02 18:21:40 +0000
+++ charms/precise/sharinfoo/revision	2014-01-13 17:21:51 +0000
@@ -1,1 +1,1 @@
-1
+2