Merge remote-tracking branch 'upstream/main' into ipv6

Conflicts are manually resolved
install/hst-install-debian.sh
install/hst-install-ubuntu.sh

install/deb/nginx/nginx.conf

@@ -112,7 +112,7 @@ http {
 	ssl_dhparam                     /etc/ssl/dhparam.pem;
 	ssl_ecdh_curve                  secp384r1;
 	ssl_session_tickets             off;
-	resolver                        1.0.0.1 1.1.1.1 valid=300s ipv6=off;
+	resolver                        1.1.1.1 8.8.8.8 valid=300s ipv6=off;
 	resolver_timeout                5s;
 	# Error pages
 	error_page                      403 /error/404.html;

install/hst-install-debian.sh

@@ -1359,8 +1359,8 @@ if [ -n "$resolver" ]; then
 	    sed -i "s/1.0.0.1 \[2606:4700:4700::1111\] 1.0.0.1 \[2606:4700:4700::1001\]/$resolver/g" /etc/nginx/nginx.conf
 	    sed -i "s/1.0.0.1 \[2606:4700:4700::1111\] 1.0.0.1 \[2606:4700:4700::1001\]/$resolver/g" /usr/local/hestia/nginx/conf/nginx.conf
 	else
-	    sed -i "s/1.0.0.1 1.1.1.1/$resolver/g" /etc/nginx/nginx.conf
-	    sed -i "s/1.0.0.1 1.1.1.1/$resolver/g" /usr/local/hestia/nginx/conf/nginx.conf
+	    sed -i "s/1.0.0.1 8.8.8.8/$resolver/g" /etc/nginx/nginx.conf
+	    sed -i "s/1.0.0.1 8.8.8.8/$resolver/g" /usr/local/hestia/nginx/conf/nginx.conf
 	fi
 fi
 

install/hst-install-ubuntu.sh

@@ -1444,8 +1444,8 @@ if [ -n "$resolver" ]; then
 		sed -i "s/1.0.0.1 \[2606:4700:4700::1111\] 1.0.0.1 \[2606:4700:4700::1001\]/$resolver/g" /etc/nginx/nginx.conf
 		sed -i "s/1.0.0.1 \[2606:4700:4700::1111\] 1.0.0.1 \[2606:4700:4700::1001\]/$resolver/g" /usr/local/hestia/nginx/
 	else
-		sed -i "s/1.0.0.1 1.1.1.1/$resolver/g" /etc/nginx/nginx.conf
-		sed -i "s/1.0.0.1 1.1.1.1/$resolver/g" /usr/local/hestia/nginx/conf/nginx.conf
+		sed -i "s/1.0.0.1 8.8.8.8/$resolver/g" /etc/nginx/nginx.conf
+		sed -i "s/1.0.0.1 8.8.8.8/$resolver/g" /usr/local/hestia/nginx/conf/nginx.conf
 	fi
 fi
 

install/rpm/nginx/nginx.conf

@@ -107,7 +107,7 @@ http {
 	ssl_dhparam                   /etc/ssl/dhparam.pem;
 	ssl_ecdh_curve                secp384r1;
 	ssl_session_tickets           off;
-	resolver                      1.0.0.1 1.1.1.1 valid=300s ipv6=off;
+	resolver                      1.1.1.1 8.8.8.8 valid=300s ipv6=off;
 	resolver_timeout              5s;
 	# Error pages
 	error_page                    403 /error/404.html;

src/deb/nginx/nginx.conf

@@ -82,7 +82,7 @@ http {
 	ssl_ecdh_curve                secp384r1;
 	# ssl_reject_handshake on;
 	ssl_session_tickets           off;
-	resolver                      1.0.0.1 1.1.1.1 valid=300s ipv6=off;
+	resolver                      1.1.1.1 8.8.8.8 valid=300s ipv6=off;
 	resolver_timeout              5s;
 	ssl_stapling                  on;
 	ssl_stapling_verify           on;

src/rpm/nginx/nginx.conf

@@ -81,7 +81,7 @@ http {
 	ssl_dhparam                   /etc/ssl/dhparam.pem;
 	ssl_ecdh_curve                secp384r1;
 	ssl_session_tickets           off;
-	resolver                      1.0.0.1 1.1.1.1 valid=300s ipv6=off;
+	resolver                      1.1.1.1 8.8.8.8 valid=300s ipv6=off;
 	resolver_timeout              5s;
 	ssl_stapling                  on;
 	ssl_stapling_verify           on;