From a5ef32038d7d149b1f7bc90628ebc88e23eae49b Mon Sep 17 00:00:00 2001 From: timvisee Date: Thu, 9 Jul 2020 11:34:03 +0200 Subject: [PATCH] Various tweaks --- .env.example | 6 +++--- README.md | 6 +++--- docker-compose.yaml | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.env.example b/.env.example index 82a0695..c04cb46 100644 --- a/.env.example +++ b/.env.example @@ -1,8 +1,8 @@ # Host to expose Send on HOST=send.example.org -# Optional: for LetsEncrypt SSL, your email address -LETSENCRYPT_EMAIL=mail@example.org - # Optional: for LetsEncrypt SSL, same as HOST LETSENCRYPT_HOST= + +# Optional: for LetsEncrypt SSL, your email address +LETSENCRYPT_EMAIL=mail@example.org diff --git a/README.md b/README.md index 0740ba1..7abfb94 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,9 @@ # Host to expose Send on HOST=send.example.org -# Optional: for LetsEncrypt SSL, your email address -LETSENCRYPT_EMAIL=mail@example.org - # Optional: for LetsEncrypt SSL, same as HOST LETSENCRYPT_HOST= + +# Optional: for LetsEncrypt SSL, your email address +LETSENCRYPT_EMAIL=mail@example.org ``` diff --git a/docker-compose.yaml b/docker-compose.yaml index e0dfb19..75dc784 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -12,7 +12,7 @@ services: - DEFAULT_HOST=${HOST} volumes: - /var/run/docker.sock:/tmp/docker.sock:ro - - proxy-certs:/etc/nginx/certs + - proxy-certs:/etc/nginx/certs:ro - proxy-vhost:/etc/nginx/vhost.d - proxy-html:/usr/share/nginx/html proxy-letsencrypt: @@ -20,6 +20,8 @@ services: restart: always environment: - DEFAULT_EMAIL=${LETSENCRYPT_EMAIL} + - NGINX_PROXY_CONTAINER=nginx-proxy + - NGINX_DOCKER_GEN_CONTAINER=nginx-proxy volumes: - /var/run/docker.sock:/var/run/docker.sock:ro - proxy-certs:/etc/nginx/certs @@ -35,6 +37,7 @@ services: - VIRTUAL_PORT=1234 - DHPARAM_GENERATION=false - LETSENCRYPT_HOST + - LETSENCRYPT_EMAIL - PORT=1234 - REDIS_HOST=redis redis: