From e2947a127e5df08fb3af0e841fc0f0d841963e15 Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Mon, 26 Feb 2024 12:43:40 +0100 Subject: [PATCH] Update Docker image reference in update-conf script and fix syntax error in nginx.conf.j2 template --- imageroot/bin/update-conf | 2 +- imageroot/templates/nginx.conf.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/imageroot/bin/update-conf b/imageroot/bin/update-conf index 5eaa02e5..d85a8829 100755 --- a/imageroot/bin/update-conf +++ b/imageroot/bin/update-conf @@ -46,7 +46,7 @@ if ! diff -q nginx.conf ${tmpconf} ; then --log-driver=none \ --env=NGINX_ENTRYPOINT_QUIET_LOGS=1 \ --volume=./:/srv:z \ - --rm "${NGINX_IMAGE}" \ + --rm "${LDAPPROXY_BINARY_IMAGE}" \ nginx -t -c "/srv/${tmpconf}" mv -v ${tmpconf} nginx.conf fi diff --git a/imageroot/templates/nginx.conf.j2 b/imageroot/templates/nginx.conf.j2 index 32d709fb..6aa48e9c 100644 --- a/imageroot/templates/nginx.conf.j2 +++ b/imageroot/templates/nginx.conf.j2 @@ -19,7 +19,7 @@ stream { proxy_ssl {{ 'on' if item.tls == '1' else 'off' }}; proxy_ssl_verify {{ 'on' if item.tls_verify == '1' else 'off' }}; proxy_ssl_verify_depth {{ item.tls_verify_depth | default('2') }}; - proxy_ssl_trusted_certificate /etc/ssl/certs/ca-certificates.crt'; + proxy_ssl_trusted_certificate /etc/ssl/certs/ca-certificates.crt; proxy_ssl_name {{ item.domain }}; } upstream {{ item.domain | replace('.', '_') }} {