Update conf only after upgrade / reload from backup (hestiacp#3908)

* Update conf only after upgrade / reload from backup

* Fix typo in function call

---------

Co-authored-by: Kristan Kenney <139469540+krismkenn@users.noreply.github.com>

Author: jaapmarcus

bin/v-add-sys-ip

@@ -201,7 +201,8 @@ fi
 
 # Adapt Port Listing in HESTIA NGINX Backend
 syshealth_adapt_hestia_nginx_listen_ports
-
+# Also update resolver
+syshealth_adapt_nginx_resolver
 #----------------------------------------------------------#
 #                       Hestia                             #
 #----------------------------------------------------------#

func/syshealth.sh

@@ -623,3 +623,22 @@ function syshealth_adapt_hestia_nginx_listen_ports() {
 	[ $? -ne 0 ] && NGINX_BCONF_CHANGED="yes"
 	rm -f "$NGINX_BCONF_TEMP" > /dev/null 2>&1
 }
+
+syshealth_adapt_nginx_resolver() {
+	NGINX_CONF="/usr/local/hestia/nginx/conf/nginx.conf"
+	if grep -qw "1.0.0.1 8.8.4.4 1.1.1.1 8.8.8.8" "$NGINX_CONF"; then
+		for nameserver in $(grep -is '^nameserver' /etc/resolv.conf | cut -d' ' -f2 | tr '\r\n' ' ' | xargs); do
+			if echo "$nameserver" | grep -Pq "^(\d{1,3}\.){3}\d{1,3}$"; then
+				if [ -z "$resolver" ]; then
+					resolver="$nameserver"
+				else
+					resolver="$resolver $nameserver"
+				fi
+			fi
+		done
+
+		if [ -n "$resolver" ]; then
+			sed -i "s/1.0.0.1 8.8.4.4 1.1.1.1 8.8.8.8/$resolver/g" "$NGINX_CONF"
+		fi
+	fi
+}

src/deb/nginx/hestia

@@ -31,26 +31,7 @@ set -e
 
 . /etc/profile.d/hestia.sh
 
-update_nginx_resolver() {
-	if grep -qw "1.0.0.1 8.8.4.4 1.1.1.1 8.8.8.8" "$NGINX_CONF"; then
-		for nameserver in $(grep -is '^nameserver' /etc/resolv.conf | cut -d' ' -f2 | tr '\r\n' ' ' | xargs); do
-			if echo "$nameserver" | grep -Pq "^(\d{1,3}\.){3}\d{1,3}$"; then
-				if [ -z "$resolver" ]; then
-					resolver="$nameserver"
-				else
-					resolver="$resolver $nameserver"
-				fi
-			fi
-		done
-
-		if [ -n "$resolver" ]; then
-			sed -i "s/1.0.0.1 8.8.4.4 1.1.1.1 8.8.8.8/$resolver/g" "$NGINX_CONF"
-		fi
-	fi
-}
-
 start_nginx() {
-	update_nginx_resolver
 	start-stop-daemon --start --quiet --pidfile $NGINX_PID \
 		--retry 5 --exec $NGINX_DAEMON --oknodo
 }

src/deb/nginx/postinst

@@ -13,6 +13,7 @@ invoke-rc.d hestia start || true
 # Adapt Port Listing in HESTIA NGINX Backend
 source /usr/local/hestia/func/syshealth.sh # Load syshealth functions
 syshealth_adapt_hestia_nginx_listen_ports  # Adapt port listing
+syshealth_adapt_nginx_resolver
 
 # Run triggers only on updates
 if [ ! -e "/usr/local/hestia/data/users/" ]; then