Skip to content

Commit

Permalink
Update Docker image reference in update-conf script and fix syntax er…
Browse files Browse the repository at this point in the history
…ror in nginx.conf.j2 template
  • Loading branch information
stephdl committed Feb 26, 2024
1 parent cfedb9d commit e2947a1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion imageroot/bin/update-conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion imageroot/templates/nginx.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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('.', '_') }} {
Expand Down

0 comments on commit e2947a1

Please sign in to comment.