Merge lp:~abentley/charms/precise/charmworld/apache2 into lp:~juju-jitsu/charms/precise/charmworld/trunk

[Aaron Bentley]

Support apache2 frontend

Allow apache2 to be used as a reverse proxy by supporting the reverseproxy
relation. Add config script and update docs for setting up apache2 properly.

https://codereview.appspot.com/7271047/

[Richard Harding (rharding)]

lgtm with a couple of questions. I figure this will probably need some
testing/etc to get it working 100% right.

https://codereview.appspot.com/7271047/diff/1/README.md
File README.md (right):

https://codereview.appspot.com/7271047/diff/1/README.md#newcode29
README.md:29: juju deploy local:apache2
Doesn't this need to point to a path with the right stucture? Should
that be documented?

Or is it picked up without the --repository as long as it's in the cwd?

https://codereview.appspot.com/7271047/diff/1/scripts/configure-apache2
File scripts/configure-apache2 (right):

https://codereview.appspot.com/7271047/diff/1/scripts/configure-apache2#newcode6
scripts/configure-apache2:6: ServerName staging.jujucharms.com
This hard coding of a server name seems like trouble. I wonder if this
can be removed, made to pull from the environment somehow, or does it
need to be a config option as well? It seems like IS should have had to
do this themselves so curious if they've got an answer already.

https://codereview.appspot.com/7271047/

=== modified file 'README.md'
--- README.md	2013-01-24 15:46:55 +0000
+++ README.md	2013-02-04 18:41:34 +0000
@@ -22,9 +22,17 @@
 
     juju add-relation charmworld mongodb
 
+Add an Apache proxy
+
+    # You'll need a local repository with a copy of
+    # lp:~canonical-losas/canonical-marshal/apache2
+    juju deploy local:apache2
+    scripts/configure-apache2
+    juju add-relation apache2:reverseproxy charmworld
+
 Finally, expose charmworld to the Internet
 
-    juju expose charmworld
+    juju expose apache2
 
 You should now be able to get to charmworld via the IP address provided in the
 output of `juju status`.

=== added file 'hooks/reverseproxy-relation-joined'
--- hooks/reverseproxy-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/reverseproxy-relation-joined	2013-02-04 18:41:34 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -eux
+relation-set port=80

=== modified file 'metadata.yaml'
--- metadata.yaml	2013-01-31 20:03:15 +0000
+++ metadata.yaml	2013-02-04 18:41:34 +0000
@@ -12,3 +12,5 @@
 requires:
   database:
     interface: mongodb
+  reverseproxy:
+    interface: http

=== modified file 'revision'
--- revision	2013-01-30 20:34:57 +0000
+++ revision	2013-02-04 18:41:34 +0000
@@ -1,1 +1,1 @@
-19
+20

=== added file 'scripts/configure-apache2'
--- scripts/configure-apache2	1970-01-01 00:00:00 +0000
+++ scripts/configure-apache2	2013-02-04 18:41:34 +0000
@@ -0,0 +1,14 @@
+#!/bin/sh
+set +eux
+juju set apache2 "enable_modules=proxy proxy_http"
+juju set apache2 "vhost_http_template=$(base64 <<EOT
+<VirtualHost *:80>
+      ServerName staging.jujucharms.com
+      CustomLog /var/log/apache2/charmworld-access.log combined
+      ErrorLog /var/log/apache2/charmworld-error.log
+      ProxyRequests off
+      ProxyPass / http://{{ charmworld }}/
+      ProxyPassReverse / http://{{ charmworld }}/
+</VirtualHost>
+EOT
+)"