web: auto-detect nginx resolver

Take it from /etc/resolv.conf in case it wasn't provided via the env variable. Fixes: #1430
jitsi · Nov 3, 2022 · 53b2654 · 53b2654
1 parent 9fbb5bd
commit 53b2654
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/web/rootfs/defaults/nginx.conf b/web/rootfs/defaults/nginx.conf
@@ -26,7 +26,9 @@ http {
 
 	client_max_body_size 0;
 
-	resolver {{ .Env.NGINX_RESOLVER | default "127.0.0.11" }};
+	{{ if .Env.NGINX_RESOLVER }}
+	resolver {{ .Env.NGINX_RESOLVER }};
+	{{ end -}}
 
  	include /etc/nginx/mime.types;
 	types {

diff --git a/web/rootfs/etc/cont-init.d/10-config b/web/rootfs/etc/cont-init.d/10-config
@@ -63,6 +63,13 @@ if [[ $DISABLE_HTTPS -ne 1 ]]; then
     fi
 fi
 
+# Detect nameserver for Nginx, if not specified.
+if [[ -z "$NGINX_RESOLVER" ]]; then
+    export NGINX_RESOLVER=$(grep nameserver /etc/resolv.conf | cut -d" " -f2 | tr "\n" " " | sed -e "s/[[:space:]]*$//")
+fi
+
+echo "Using Nginx resolver: =$NGINX_RESOLVER="
+
 # copy config files
 tpl /defaults/nginx.conf > /config/nginx/nginx.conf