Merge lp:~evarlast/charms/precise/varnish/hyphen-to-underscore into lp:charms/varnish

[Jay R. Wren]

- to _ in varnish config

https://bugs.launchpad.net/charms/+source/varnish/+bug/1203630

[Tim Van Steenburgh (tvansteenburgh)]

+1 LGTM.

review: Approve

[Charles Butler (lazypower)]

Great fix, merging. Thanks for the submission Jay!

review: Approve

=== modified file 'hooks/reverseproxy-relation-changed'
--- hooks/reverseproxy-relation-changed	2012-06-22 17:03:03 +0000
+++ hooks/reverseproxy-relation-changed	2014-07-14 19:26:32 +0000
@@ -23,7 +23,7 @@
   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//\//}
+unit_name=$(echo ${member//\//} | tr - _)
   cat >> /etc/varnish/default.vcl << EOF
 backend $unit_name {
   .host = "${unit_addr}";
@@ -44,7 +44,7 @@
 echo 'director balance round-robin {' >> /etc/varnish/default.vcl
 
 for member in $members; do
-  unit_name=${member//\//}
+  unit_name=$(echo ${member//\//} | tr - _)
   cat >> /etc/varnish/default.vcl << EOF
   { .backend = $unit_name; }
 EOF