Merge 6c5dbf54e7 into 498109addb

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-10-04 20:00:12 +00:00 · 2025-01-29 17:56:21 +01: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-07 10:30:08 +10:00
10 changed files with 31 additions and 14 deletions
--- a/6
+++ b/6
@@ -128,7 +128,7 @@ pipeline {
 					sh 'docker-compose down --remove-orphans --volumes -t 30 || true'
 				}
 				unstable {
-					dir(path: 'testing/results') {
+					dir(path: 'test/results') {
 						archiveArtifacts(allowEmptyArchive: true, artifacts: '**/*', excludes: '**/*.xml')
 					}
 				}
@@ -161,7 +161,7 @@ pipeline {
 					sh 'docker-compose down --remove-orphans --volumes -t 30 || true'
 				}
 				unstable {
-					dir(path: 'testing/results') {
+					dir(path: 'test/results') {
 						archiveArtifacts(allowEmptyArchive: true, artifacts: '**/*', excludes: '**/*.xml')
 					}
 				}
@@ -199,7 +199,7 @@ pipeline {
 					sh 'docker-compose down --remove-orphans --volumes -t 30 || true'
 				}
 				unstable {
-					dir(path: 'testing/results') {
+					dir(path: 'test/results') {
 						archiveArtifacts(allowEmptyArchive: true, artifacts: '**/*', excludes: '**/*.xml')
 					}
 				}
--- 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/templates/_location.conf
+++ b/backend/templates/_location.conf
@@ -2,8 +2,8 @@
    {{ advanced_config }}

    proxy_set_header Host $host;
-    proxy_set_header X-Forwarded-Scheme $scheme;
-    proxy_set_header X-Forwarded-Proto  $scheme;
+    proxy_set_header X-Forwarded-Scheme $resolved_proto;
+    proxy_set_header X-Forwarded-Proto  $resolved_proto;
    proxy_set_header X-Forwarded-For    $remote_addr;
    proxy_set_header X-Real-IP		$remote_addr;

--- a/backend/templates/proxy_host.conf
+++ b/backend/templates/proxy_host.conf
@@ -4,6 +4,8 @@

 {% include "_hsts_map.conf" %}

+include conf.d/include/resolved_proto_map.conf;
+
 server {
  set $forward_scheme {{ forward_scheme }};
  set $server         "{{ forward_host }}";
--- a/docker/docker-compose.ci.yml
+++ b/docker/docker-compose.ci.yml
@@ -40,7 +40,7 @@ services:
          - ca.internal

  pdns:
-    image: pschiffe/pdns-mysql
+    image: pschiffe/pdns-mysql:4.8
    volumes:
      - '/etc/localtime:/etc/localtime:ro'
    environment:
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -132,7 +132,7 @@ services:
      - 8128:3128

  pdns:
-    image: pschiffe/pdns-mysql
+    image: pschiffe/pdns-mysql:4.8
    container_name: npm2dev.pdns
    volumes:
      - '/etc/localtime:/etc/localtime:ro'
@@ -218,7 +218,7 @@ services:
    env_file:
      - ci.env
    ports:
-      - 9000:9000 
+      - 9000:9000
    depends_on:
      - authentik-redis
      - db-postgres
--- a/docker/rootfs/etc/nginx/conf.d/include/proxy.conf
+++ b/docker/rootfs/etc/nginx/conf.d/include/proxy.conf
@@ -1,8 +1,7 @@
 add_header       X-Served-By $host;
 proxy_set_header Host $host;
-proxy_set_header X-Forwarded-Scheme $scheme;
-proxy_set_header X-Forwarded-Proto  $scheme;
+proxy_set_header X-Forwarded-Scheme $resolved_proto;
+proxy_set_header X-Forwarded-Proto  $resolved_proto;
 proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
 proxy_set_header X-Real-IP          $remote_addr;
 proxy_pass       $forward_scheme://$server:$port$request_uri;
-
--- a/docker/rootfs/etc/nginx/conf.d/include/resolved_proto_map.conf
+++ b/docker/rootfs/etc/nginx/conf.d/include/resolved_proto_map.conf
@@ -0,0 +1,7 @@
+# Resolve the effective protocol: use X-Forwarded-Proto if set
+# (e.g., from proxies like Cloudflare or AWS)
+# otherwise fall back to the current scheme.
+map $http_x_forwarded_proto $resolved_proto {
+    default $scheme;
+    ~.+ $http_x_forwarded_proto;
+}
--- 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"
--- a/global/certbot-dns-plugins.json
+++ b/global/certbot-dns-plugins.json
@@ -215,6 +215,14 @@
 		"credentials": "# Gandi personal access token\ndns_gandi_token=PERSONAL_ACCESS_TOKEN",
 		"full_plugin_name": "dns-gandi"
 	},
+	"gcore": {
+		"name": "Gcore DNS",
+		"package_name": "certbot-dns-gcore",
+		"version": "~=0.1.8",
+		"dependencies": "",
+		"credentials": "dns_gcore_apitoken = 0123456789abcdef0123456789abcdef01234567",
+		"full_plugin_name": "dns-gcore"
+	},
 	"godaddy": {
 		"name": "GoDaddy",
 		"package_name": "certbot-dns-godaddy",
Author	SHA1	Message	Date
Seyed Mansour Mirbehbahani	438880d3d9	Merge `6c5dbf54e7` into `498109addb`	2025-01-29 17:56:21 +01: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
Jamie Curnow	9687e9e450	Use previous version of powerdns image, newer version is broken All checks were successful Close stale issues and PRs / stale (push) Successful in 3s Details	2025-01-07 10:30:08 +10:00
Jamie Curnow	5a234bb88c	Fix incorrect test folder in ci results	2025-01-07 08:13:04 +10:00
jc21	4de4b65036	Merge pull request #4252 from GergelyGombai/develop Add Gcore DNS Provider	2025-01-07 07:54:44 +10:00
dim145	f1c97c7c36	fix: add missing group_by clause for access_list get	2025-01-03 00:39:29 +01:00
Seyed Mansour Mirbehbahani	6c5dbf54e7	🔼 Since `resolved_progo_map.conf` doesn't change content per host, we should put it in `/docker/rootfs/etc/nginx/conf.d/include/resolved_proto_map.conf` instead.	2024-12-29 14:49:31 +03:30
Seyed Mansour Mirbehbahani	993ce372b2	🔼 added $resolved_proto map to ensure that the X-Forwarded-Proto and X-Forwarded-Scheme headers reflect the most accurate protocol. The resolved_proto variable prioritizes the X-Forwarded-Proto header (set by sources like Cloudflare or AWS) and falls back to $scheme when unavailable, then this value is used to set Scheme and Proto instead of $scheme	2024-12-29 09:41:42 +03:30
ComradeBlin	73110d5e1e	Update Gcore apikey format I managed to mis-write the format in my previous commit	2024-12-22 01:44:52 +01:00
ComradeBlin	356b98bf7e	Add Gcore DNS Provider	2024-12-22 01:02:47 +01:00