From ac22cce2c171ed4bb1b4a98999bdfce01ca46742 Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Fri, 25 Nov 2016 12:54:50 +0000
Subject: [PATCH] rename services
---
docker-compose.yml | 4 ++--
templates/haproxy.cfg.tmpl | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index cbf6333..97dcec7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,11 +15,11 @@ haproxy:
ports:
- "80:80"
- "443:443"
-letsencrypt:
+letsencrypt-web:
image: nginx
volumes:
- "./acme-challenge:/usr/share/nginx/html/.well-known/acme-challenge:ro"
-letsencrypt-watch:
+letsencrypt:
image: indiehosters/letsencrypt
volumes:
- "./haproxy:/etc/haproxy"
diff --git a/templates/haproxy.cfg.tmpl b/templates/haproxy.cfg.tmpl
index 55262d3..bed02a2 100644
--- a/templates/haproxy.cfg.tmpl
+++ b/templates/haproxy.cfg.tmpl
@@ -33,7 +33,7 @@ mode http
reqadd X-Forwarded-Proto:\ https
rspadd Strict-Transport-Security:\ max-age=15768000
- use_backend letsencrypt if { path_beg /.well-known/acme }
+ use_backend letsencrypt-web if { path_beg /.well-known/acme }
{{ range $host, $containers := groupByMulti $ "Env.VIRTUAL_HOST" "," }}
use_backend {{ $host}} if { hdr(host) -i {{ $host }} }
{{end}}
@@ -48,6 +48,6 @@ backend {{ $host }}
{{end}}
{{end}}
-backend letsencrypt
+backend letsencrypt-web
cookie SERVERID insert nocache indirect
- server Server letsencrypt:80 cookie Server
+ server Server letsencrypt-web:80 cookie Server
--
GitLab