Merge commit '74eef4dedae617' into 1.0

This commit is contained in:
Paul Bellamy committed 2015-08-13 12:38:51 +01:00
commit 360c0cb642
1 file changed
+1 -1
+1 -1
View File
@@ -882,7 +882,7 @@ ipam_cidrs_or_die() {
# TODO: Handle args with spaces
tls_arg() {
filename=${3:-$2}
PROXY_VOLUMES="$PROXY_VOLUMES -v $1:/home/weave/tls/$filename.pem"
PROXY_VOLUMES="$PROXY_VOLUMES -v $1:/home/weave/tls/$filename.pem:ro"
PROXY_ARGS="$PROXY_ARGS --tls$2 /home/weave/tls/$filename.pem"
}