Merge 4cb39fe332bbca97d6a51ac775184c9f456006af into 498109addb6f2541082b88cb6ae115939321873c

Bump vite from 5.4.8 to 5.4.14 in /docs

backend/internal/access-list.js

@@ -258,6 +258,7 @@ const internalAccessList = {
 					})
 					.where('access_list.is_deleted', 0)
 					.andWhere('access_list.id', data.id)
+					.groupBy('access_list.id')
 					.allowGraph('[owner,items,clients,proxy_hosts.[certificate,access_list.[clients,items]]]')
 					.first();
 

backend/internal/nginx.js

@@ -235,6 +235,19 @@ const internalNginx = {
 			// Set the IPv6 setting for the host
 			host.ipv6 = internalNginx.ipv6Enabled();
 			
+			
+			if ( nice_host_type === 'proxy_host' ) {			
+				let listen_ports = [];
+				host.domain_names.map( function (domain_name) {
+					if ( domain_name.indexOf(':') > 0 ){
+						listen_ports.push(parseInt(domain_name.substring(domain_name.indexOf(':')+1)));
+					}
+				});
+				if ( listen_ports.length > 0 ){
+					host.listen_ports = listen_ports;
+				}
+			}
+
 			locationsPromise.then(() => {
 				renderEngine
 					.parseAndRender(template, host)

backend/templates/_listen.conf

@@ -12,6 +12,9 @@
   #listen [::]:443;
 {% endif %}
 {% endif %}
+{% for listen_port in listen_ports %}
+  listen listen_port;
+{% endfor %}
   server_name {{ domain_names | join: " " }};
 {% if http2_support == 1 or http2_support == true %}
   http2 on;

docker/rootfs/etc/nginx/conf.d/include/proxy.conf

@@ -1,5 +1,5 @@
 add_header       X-Served-By $host;
-proxy_set_header Host $host;
+proxy_set_header Host $http_host;
 proxy_set_header X-Forwarded-Scheme $scheme;
 proxy_set_header X-Forwarded-Proto  $scheme;
 proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;

docs/yarn.lock

@@ -1065,9 +1065,9 @@ vfile@^6.0.0:
     vfile-message "^4.0.0"
 
 vite@^5.4.8:
-  version "5.4.8"
+  version "5.4.14"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.8.tgz#af548ce1c211b2785478d3ba3e8da51e39a287e8"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.14.tgz#ff8255edb02134df180dcfca1916c37a6abe8408"
-  integrity sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==
+  integrity sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==
   dependencies:
     esbuild "^0.21.3"
     postcss "^8.4.43"