From dea5ebd99b87e1d48dff8d51cf183e845ab3f526 Mon Sep 17 00:00:00 2001 From: Wanis Fahmy <51237742+wanisfahmyDE@users.noreply.github.com> Date: Tue, 20 Feb 2024 09:36:33 +0100 Subject: [PATCH] feat: extends DNS variable assignment to additionally handle IPv6 (#6976) (cherry picked from commit 716d1e4164d1cc1cb17fa48cc45b36aebfedd1ea) --- config-ui/nginx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-ui/nginx.sh b/config-ui/nginx.sh index 7daa47577aa..cdb981b574d 100755 --- 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}