Merge remote-tracking branch 'origin/master'

vfarcic · Nov 29, 2016 · 80c2fd8 · 80c2fd8
2 parents f24996c + db0a88f
commit 80c2fd8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ The base HAProxy configuration can be found in [haproxy.tmpl](haproxy.tmpl). It
 
 ```
 FROM vfarcic/docker-flow-proxy
-COPY haproxy.tmpl /cfg/haproxy.tmpl
+COPY haproxy.tmpl /cfg/tmpl/haproxy.tmpl
 ```
 
 ### Reconfigure

diff --git a/articles/swarm-mode-listener.md b/articles/swarm-mode-listener.md
@@ -318,7 +318,7 @@ There are two ways we can add certificates to the proxy. One is to create your o
 ```
 FROM vfarcic/docker-flow-proxy
 COPY my-cert.pem /certs/my-cert.pem
-COPY haproxy.tmpl /cfg/haproxy.tmpl
+COPY haproxy.tmpl /cfg/tmpl/haproxy.tmpl
 ```
 
 When the image is built, it will be based on `vfarcic/docker-flow-proxy` and include `my-cert.pem` and `haproxy.tmpl` files. The `my-cert.pem` would be your certificate and the `haproxy.tmpl` the modified version of the original proxy template located in [https://github.com/vfarcic/docker-flow-proxy/blob/master/haproxy.tmpl](https://github.com/vfarcic/docker-flow-proxy/blob/master/haproxy.tmpl). You'd need to replace `{{.CertsString}}` with ` ssl crt /certs/my-cert.pem` (please note that the string should start with space). The complete line would be as follows.