Merge 4cb39fe332bbca97d6a51ac775184c9f456006af into 498109addb6f2541082b88cb6ae115939321873c

Merge pull request #4310 from NginxProxyManager/dependabot/npm_and_yarn/docs/vite-5.4.14
Bump vite from 5.4.8 to 5.4.14 in /docs
2025-05-12 08:43:08 +00:00 · 2025-01-28 13:13:54 +00:00 · 2025-01-28 18:08:46 +10:00 · 2025-01-28 14:03:07 +10:00 · 2025-01-22 07:09:04 +00:00 · 2025-01-03 00:39:29 +01:00
5 changed files with 21 additions and 4 deletions
--- a/backend/internal/access-list.js
+++ b/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();

--- a/backend/internal/nginx.js
+++ b/backend/internal/nginx.js
@ -234,6 +234,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
--- a/backend/templates/_listen.conf
+++ b/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;
--- a/docker/rootfs/etc/nginx/conf.d/include/proxy.conf
+++ b/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;
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@ -1065,9 +1065,9 @@ vfile@^6.0.0:
    vfile-message "^4.0.0"

 vite@^5.4.8:
-  version "5.4.8"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.8.tgz#af548ce1c211b2785478d3ba3e8da51e39a287e8"
-  integrity sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==
+  version "5.4.14"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.14.tgz#ff8255edb02134df180dcfca1916c37a6abe8408"
+  integrity sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==
  dependencies:
    esbuild "^0.21.3"
    postcss "^8.4.43"
Author	SHA1	Message	Date
Xialijun	27f5bd91ee	Merge 4cb39fe332bbca97d6a51ac775184c9f456006af into 498109addb6f2541082b88cb6ae115939321873c	2025-01-28 13:13:54 +00:00
jc21	498109addb	Merge pull request #4310 from NginxProxyManager/dependabot/npm_and_yarn/docs/vite-5.4.14 All checks were successful Close stale issues and PRs / stale (push) Successful in 3s Details Bump vite from 5.4.8 to 5.4.14 in /docs	2025-01-28 18:08:46 +10:00
jc21	3f3aacd7ec	Merge pull request #4274 from Dim145/develop [Postgres] fix error in access_list get	2025-01-28 14:03:07 +10:00
dependabot[bot]	bb4ecf812d	Bump vite from 5.4.8 to 5.4.14 in /docs Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.4.8 to 5.4.14. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v5.4.14/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.4.14/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2025-01-22 07:09:04 +00:00
dim145	f1c97c7c36	fix: add missing group_by clause for access_list get	2025-01-03 00:39:29 +01:00
xialj	4cb39fe332	is more suitable for ,if listen port is no 80 or 443	2023-08-11 11:13:39 +08:00
xialj	1a983651a5	proxy_set_header Host is not useful in proxy_host.conf,it should be modify in conf.d/include/proxy.conf	2023-08-11 11:12:06 +08:00
xialj	145fe2d24f	Strings must use singlequote quotes	2023-08-01 00:17:40 +08:00
xialj	5dbb0b921e	Strings must use singlequote quotes	2023-08-01 00:05:33 +08:00
xialj	700d908abd	varible listen_ports should be in case which nice_host_type is proxy_host	2023-08-01 00:04:11 +08:00
xialj	7f2552d77f	formatting nginx.js	2023-08-01 00:01:22 +08:00
xialj	bbeb4f5a60	formatting nginx.js	2023-07-31 23:56:59 +08:00
xialj	c166f6b41f	formatting nginx.js	2023-07-31 23:56:25 +08:00
xialj	05831fcd44	formatting nginx.js	2023-07-31 23:55:03 +08:00
xialj	dec0ff31eb	bugfix when create a proxy-host.conf can with more ports	2023-07-31 23:52:27 +08:00
xialj	4ebfb4247c	bugfix when create a proxy-host.conf can with more ports	2023-07-31 23:39:25 +08:00
Xialijun	75c2f73796	Merge branch 'NginxProxyManager:develop' into issue_for_external_port	2023-07-31 23:08:35 +08:00
Xialijun	fb1e4bd46c	Update proxy_host.conf by replace $host:$server with $http_host	2023-07-31 22:55:14 +08:00
xialj	f00fe275ca	allow domain like 'com.example.com:8080',use external port and nginx programmer manager listen thses ports	2023-02-13 14:33:09 +08:00