Merge lp:~newz/charms/precise/varnish/fix-lxc-deployment into lp:charms/varnish

[Matthew Nuzum]

Correcting a problem where invalid service names are being used in varnish config files causing varnish to not start.

This change fixes a problem where Varnish reverseproxy-relation-changed caused a problem. It was not using a valid service name for varnish config and therefore producing an invalid varnish config which prevents the server from starting. Varnish seems to expect service names to be letters and numbers only, but it mustn't start with a number. Therefore the service name, in the form of wordpress/0 is used with the / removed.

[Clint Byrum (clint-fewbar)]

Nicely done. Merged, thanks Matthew!

review: Approve

=== modified file 'hooks/reverseproxy-relation-changed'
--- hooks/reverseproxy-relation-changed	2012-05-24 06:17:55 +0000
+++ hooks/reverseproxy-relation-changed	2012-06-22 17:12:17 +0000
@@ -22,8 +22,10 @@
 for member in $members; do
   unit_port=`relation-get port $member`
   unit_addr=`relation-get hostname $member`
+# replace / in the member name to produce a valid varnish service name
+  unit_name=${member//\//}
   cat >> /etc/varnish/default.vcl << EOF
-backend $unit_addr {
+backend $unit_name {
   .host = "${unit_addr}";
   .port ="${unit_port}";
   .probe = {
@@ -42,9 +44,9 @@
 echo 'director balance round-robin {' >> /etc/varnish/default.vcl
 
 for member in $members; do
-  unit_addr=`relation-get hostname $member`
+  unit_name=${member//\//}
   cat >> /etc/varnish/default.vcl << EOF
-  { .backend = $unit_addr; }
+  { .backend = $unit_name; }
 EOF
 done
 

=== modified file 'revision'
--- revision	2012-05-24 08:13:35 +0000
+++ revision	2012-06-22 17:12:17 +0000
@@ -1,1 +1,1 @@
-1
+3