feat: extends DNS variable assignment to additionally handle IPv6 (#6976) (#6979)

wanis-fahmy · web-flow · commit 7f09d290977a · 2024-02-20T17:46:32.000+08:00
(cherry picked from commit 716d1e4)
diff --git a/config-ui/nginx.sh b/config-ui/nginx.sh
@@ -24,7 +24,7 @@ if [ -n "$ADMIN_USER" ] && [ -n "$ADMIN_PASS" ]; then
     auth_basic_user_file /etc/nginx/.htpasswd;
     '
 fi
-export DNS=$(grep nameserver /etc/resolv.conf | awk '{print $2}')
+export DNS=$(awk 'BEGIN{ORS=" "} $1=="nameserver" {if ($2 ~ ":") {print "["$2"]"} else {print $2}}' /etc/resolv.conf)
 export DNS_VALID=${DNS_VALID:-300s}
 export DEVLAKE_ENDPOINT_PROTO=${DEVLAKE_ENDPOINT_PROTO:-http}
 export GRAFANA_ENDPOINT_PROTO=${GRAFANA_ENDPOINT_PROTO:-http}

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ if [ -n "$ADMIN_USER" ] && [ -n "$ADMIN_PASS" ]; then`
`24`	`24`	`auth_basic_user_file /etc/nginx/.htpasswd;`
`25`	`25`	`'`
`26`	`26`	`fi`
`27`		`-export DNS=$(grep nameserver /etc/resolv.conf \| awk '{print $2}')`
	`27`	`+export DNS=$(awk 'BEGIN{ORS=" "} $1=="nameserver" {if ($2 ~ ":") {print "["$2"]"} else {print $2}}' /etc/resolv.conf)`
`28`	`28`	`export DNS_VALID=${DNS_VALID:-300s}`
`29`	`29`	`export DEVLAKE_ENDPOINT_PROTO=${DEVLAKE_ENDPOINT_PROTO:-http}`
`30`	`30`	`export GRAFANA_ENDPOINT_PROTO=${GRAFANA_ENDPOINT_PROTO:-http}`