From 4fd236f6e0faa1b1f79daddf58a04c772d9f2d31 Mon Sep 17 00:00:00 2001 From: "Federico M. Facca" Date: Mon, 8 May 2017 19:00:27 +0200 Subject: [PATCH 1/4] Added label mechanism also for docker-gen container. This is needed when using compose or other mechanims that define dynamically container's name. --- app/entrypoint.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/entrypoint.sh b/app/entrypoint.sh index a98d7aba..dec098c5 100755 --- a/app/entrypoint.sh +++ b/app/entrypoint.sh @@ -45,6 +45,19 @@ function get_nginx_proxy_cid { fi } +function get_nginx_gen_cid { + # Check if any container has been labelled as the nginx gen container. + local labeled_cid=$(docker_api "/containers/json" | jq -r '.[] | select( .Labels["com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_gen"] == "true")|.Id') + if [[ ! -z "${labeled_cid:-}" ]]; then + export NGINX_DOCKER_GEN_CONTAINER=$labeled_cid + fi + if [[ -z "${NGINX_DOCKER_GEN_CONTAINER:-}" ]]; then + echo "Error: can't get nginx-gen container id !" >&2 + echo "Label the nginx gen container to use with 'com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_gen=true'." >&2 + exit 1 + fi +} + function check_writable_directory { local dir="$1" docker_api "/containers/$HOSTNAME/json" | jq ".Mounts[].Destination" | grep -q "^\"$dir\"$" @@ -79,6 +92,7 @@ source /app/functions.sh if [[ "$*" == "/bin/bash /app/start.sh" ]]; then check_docker_socket + get_nginx_gen_cid if [[ -z "${NGINX_DOCKER_GEN_CONTAINER:-}" ]]; then [[ -z "${NGINX_PROXY_CONTAINER:-}" ]] && get_nginx_proxy_cid fi From 1d050b8e43e107056b8ffb4370d974380456a8fa Mon Sep 17 00:00:00 2001 From: "Federico M. Facca" Date: Tue, 9 May 2017 12:45:34 +0200 Subject: [PATCH 2/4] modified location file for fixing 404 error --- app/nginx_location.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/nginx_location.conf b/app/nginx_location.conf index f33c3d59..8ca989de 100644 --- a/app/nginx_location.conf +++ b/app/nginx_location.conf @@ -1,4 +1,5 @@ -location ^~ /.well-known/acme-challenge/ { +location ^~ /\.well-known/acme-challenge/ { + autoindex on; allow all; root /usr/share/nginx/html; try_files $uri =404; From 1257d932217da60eb5f48ab4a2b6983b402ff67b Mon Sep 17 00:00:00 2001 From: "Federico M. Facca" Date: Tue, 9 May 2017 13:00:48 +0200 Subject: [PATCH 3/4] second attempt to fix --- app/nginx_location.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/nginx_location.conf b/app/nginx_location.conf index 8ca989de..ef84025b 100644 --- a/app/nginx_location.conf +++ b/app/nginx_location.conf @@ -1,7 +1,7 @@ -location ^~ /\.well-known/acme-challenge/ { +location ~ /.well-known { autoindex on; allow all; root /usr/share/nginx/html; - try_files $uri =404; - break; + # try_files $uri =404; + # break; } From e75c9e3afb39daf4d6816f77647eedb6f0ba1ef3 Mon Sep 17 00:00:00 2001 From: "Federico M. Facca" Date: Tue, 9 May 2017 17:06:20 +0200 Subject: [PATCH 4/4] removed autoindex --- app/nginx_location.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/nginx_location.conf b/app/nginx_location.conf index ef84025b..0d4399da 100644 --- a/app/nginx_location.conf +++ b/app/nginx_location.conf @@ -1,7 +1,7 @@ location ~ /.well-known { - autoindex on; + # autoindex on; allow all; root /usr/share/nginx/html; - # try_files $uri =404; - # break; + try_files $uri =404; + break; }