thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2024-11-22 11:56:31 +00:00
Code Issues Releases Wiki Activity

Merge pull request #951 from kamermans/bugfix/ipv6_resolvers

Browse Source 
Added support for IPv6 DNS servers in resolver generation (issue #938)
This commit is contained in:
Jason Wilder 2017-10-20 09:50:56 -06:00 committed by GitHub
commit 795e153c2e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-entrypoint.sh
View File

@ -18,8 +18,8 @@ fi
# Note: if $DHPARAM_BITS is not defined, generate-dhparam.sh will use 2048 as a default # Note: if $DHPARAM_BITS is not defined, generate-dhparam.sh will use 2048 as a default
/app/generate-dhparam.sh $DHPARAM_BITS /app/generate-dhparam.sh $DHPARAM_BITS
# Compute the DNS resolvers for use in the templates # Compute the DNS resolvers for use in the templates - if the IP contains ":", it's IPv6 and must be enclosed in []
export RESOLVERS=$(awk '$1 == "nameserver" {print $2}' ORS=' ' /etc/resolv.conf | sed 's/ *$//g') export RESOLVERS=$(awk '$1 == "nameserver" {print ($2 ~ ":")? "["$2"]": $2}' ORS=' ' /etc/resolv.conf | sed 's/ *$//g')
if [ "x$RESOLVERS" = "x" ]; then if [ "x$RESOLVERS" = "x" ]; then
echo "Warning: unable to determine DNS resolvers for nginx" >&2 echo "Warning: unable to determine DNS resolvers for nginx" >&2
unset RESOLVERS unset RESOLVERS