Skip to content

Commit 849bdcd

Browse files
committed
Fixed generation of resolvers.conf.
This fixes scenarios where `resolv.conf` generated by dhcpcd has a nameserver with `%interface` appended to its IPv6 address. For example, a line like this must be properly handled: nameserver fe80::7747:4aff:fe9a:8cb1%br0
1 parent adc5a20 commit 849bdcd

File tree

1 file changed

+1
-1
lines changed
  • docker/rootfs/etc/services.d/nginx

1 file changed

+1
-1
lines changed

docker/rootfs/etc/services.d/nginx/run

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ chown root /tmp/nginx
2424

2525
# Dynamically generate resolvers file, if resolver is IPv6, enclose in `[]`
2626
# thanks @tfmm
27-
echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf);" > /etc/nginx/conf.d/include/resolvers.conf
27+
echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" { sub(/%.*$/,"",$2); print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf);" > /etc/nginx/conf.d/include/resolvers.conf
2828

2929
# Generate dummy self-signed certificate.
3030
if [ ! -f /data/nginx/dummycert.pem ] || [ ! -f /data/nginx/dummykey.pem ]

0 commit comments

Comments
 (0)