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

.prettierignore

@@ -24,8 +24,8 @@
 web/templates/
 
 # Hestia Nginx.conf
-/scr/deb/nginx/nginx.conf
-/scr/rpm/nginx/nginx.conf
+/src/deb/nginx/nginx.conf
+/src/rpm/nginx/nginx.conf
 
 # Email templates
 /install/common/templates/email/

src/deb/nginx/nginx.conf

@@ -92,8 +92,8 @@ http {
 
 	# Vhost
 	server {
-		#IPV4		listen				8083 ssl;
-		#IPV6		listen				[::]:8083 ssl;
+#IPV4		listen				8083 ssl;
+#IPV6		listen				[::]:8083 ssl;
 		server_name         _;
 		root                /usr/local/hestia/web;
 		# Fix error "The plain HTTP request was sent to HTTPS port"
@@ -147,4 +147,4 @@ http {
 			break                    ;
 		}
 	}
-}
+}