Merge pull request #4261 from NginxProxyManager/develop

v2.12.2

Jenkinsfile

@@ -128,7 +128,7 @@ pipeline {
 					sh 'docker-compose down --remove-orphans --volumes -t 30 || true'
 				}
 				unstable {
-					dir(path: 'test/results') {
+					dir(path: 'testing/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: 'test/results') {
+					dir(path: 'testing/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: 'test/results') {
+					dir(path: 'testing/results') {
 						archiveArtifacts(allowEmptyArchive: true, artifacts: '**/*', excludes: '**/*.xml')
 					}
 				}

backend/internal/access-list.js

@@ -258,7 +258,6 @@ 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();
 

docker/docker-compose.ci.yml

@@ -40,7 +40,7 @@ services:
           - ca.internal
 
   pdns:
-    image: pschiffe/pdns-mysql:4.8
+    image: pschiffe/pdns-mysql
     volumes:
       - '/etc/localtime:/etc/localtime:ro'
     environment:

docker/docker-compose.dev.yml

@@ -132,7 +132,7 @@ services:
       - 8128:3128
 
   pdns:
-    image: pschiffe/pdns-mysql:4.8
+    image: pschiffe/pdns-mysql
     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

docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh

@@ -3,54 +3,26 @@
 
 set -e
 
-# Lowercase
-SKIP_FILE_OWNERSHIP=$(echo "${SKIP_FILE_OWNERSHIP:-}" | tr '[:upper:]' '[:lower:]')
+log_info 'Setting ownership ...'
 
-if [ "$SKIP_FILE_OWNERSHIP" == "true" ] || [ "$SKIP_FILE_OWNERSHIP" == "on" ] || [ "$SKIP_FILE_OWNERSHIP" == "1" ] || [ "$SKIP_FILE_OWNERSHIP" == "yes" ]; then
-    log_info 'Skipping data and letsencrypt ownership, use only with caution ...'
-    # root
-    chown -R "$PUID:$PGID" /run/nginx
-    chown -R "$PUID:$PGID" /tmp/nginx
-    chown -R "$PUID:$PGID" /var/cache/nginx
-    chown -R "$PUID:$PGID" /var/lib/logrotate
-    chown -R "$PUID:$PGID" /var/lib/nginx
-    chown -R "$PUID:$PGID" /var/log/nginx
-    
-    # Don't chown entire /etc/nginx folder as this causes crashes on some systems
-    chown -R "$PUID:$PGID" /etc/nginx/nginx
-    chown -R "$PUID:$PGID" /etc/nginx/nginx.conf
-    chown -R "$PUID:$PGID" /etc/nginx/conf.d
-    
-    # Don't chown entire /etc/nginx folder as this causes crashes on some systems
-    chown -R "$PUID:$PGID" /etc/nginx/nginx
-    chown -R "$PUID:$PGID" /etc/nginx/nginx.conf
-    chown -R "$PUID:$PGID" /etc/nginx/conf.d
-    
-    # Prevents errors when installing python certbot plugins when non-root
-    chown "$PUID:$PGID" /opt/certbot /opt/certbot/bin
-    find /opt/certbot/lib/python*/site-packages -not -user "$PUID" -execdir chown "$PUID:$PGID" {} \+
-    
-else
-    log_info 'Setting ownership ...'
-      # root
-    chown root /tmp/nginx
-    
-    # npm user and group
-    chown -R "$PUID:$PGID" /data
-    chown -R "$PUID:$PGID" /etc/letsencrypt
-    chown -R "$PUID:$PGID" /run/nginx
-    chown -R "$PUID:$PGID" /tmp/nginx
-    chown -R "$PUID:$PGID" /var/cache/nginx
-    chown -R "$PUID:$PGID" /var/lib/logrotate
-    chown -R "$PUID:$PGID" /var/lib/nginx
-    chown -R "$PUID:$PGID" /var/log/nginx
-    
-    # Don't chown entire /etc/nginx folder as this causes crashes on some systems
-    chown -R "$PUID:$PGID" /etc/nginx/nginx
-    chown -R "$PUID:$PGID" /etc/nginx/nginx.conf
-    chown -R "$PUID:$PGID" /etc/nginx/conf.d
-    
-    # Prevents errors when installing python certbot plugins when non-root
-    chown "$PUID:$PGID" /opt/certbot /opt/certbot/bin
-    find /opt/certbot/lib/python*/site-packages -not -user "$PUID" -execdir chown "$PUID:$PGID" {} \+
-fi
+# root
+chown root /tmp/nginx
+
+# npm user and group
+chown -R "$PUID:$PGID" /data
+chown -R "$PUID:$PGID" /etc/letsencrypt
+chown -R "$PUID:$PGID" /run/nginx
+chown -R "$PUID:$PGID" /tmp/nginx
+chown -R "$PUID:$PGID" /var/cache/nginx
+chown -R "$PUID:$PGID" /var/lib/logrotate
+chown -R "$PUID:$PGID" /var/lib/nginx
+chown -R "$PUID:$PGID" /var/log/nginx
+
+# Don't chown entire /etc/nginx folder as this causes crashes on some systems
+chown -R "$PUID:$PGID" /etc/nginx/nginx
+chown -R "$PUID:$PGID" /etc/nginx/nginx.conf
+chown -R "$PUID:$PGID" /etc/nginx/conf.d
+
+# Prevents errors when installing python certbot plugins when non-root
+chown "$PUID:$PGID" /opt/certbot /opt/certbot/bin
+find /opt/certbot/lib/python*/site-packages -not -user "$PUID" -execdir chown "$PUID:$PGID" {} \+

docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh

@@ -10,7 +10,6 @@ log_info 'IPv6 ...'
 
 # Lowercase
 DISABLE_IPV6=$(echo "${DISABLE_IPV6:-}" | tr '[:upper:]' '[:lower:]')
-SKIP_FILE_OWNERSHIP=$(echo "${SKIP_FILE_OWNERSHIP:-}" | tr '[:upper:]' '[:lower:]')
 
 process_folder () {
 	FILES=$(find "$1" -type f -name "*.conf")
@@ -32,17 +31,9 @@ process_folder () {
 		echo "$(sed -E "$SED_REGEX" "$FILE")" > $FILE
 	done
 
-
-		# ensure the files are still owned by the npm user
-		chown -R "$PUID:$PGID" "$1"
- 	fi
+	# ensure the files are still owned by the npm user
+	chown -R "$PUID:$PGID" "$1"
 }
 
-# process files on base image
 process_folder /etc/nginx/conf.d
-# conditionally process files that are probably in a volume or bind
-if [ "$SKIP_FILE_OWNERSHIP" == "true" ] || [ "$SKIP_FILE_OWNERSHIP" == "on" ] || [ "$SKIP_FILE_OWNERSHIP" == "1" ] || [ "$SKIP_FILE_OWNERSHIP" == "yes" ]; then
-    log_info 'Skipping data and letsencrypt ownership, use only with caution ...'
-else
-    process_folder /data/nginx
-fi
+process_folder /data/nginx

docs/yarn.lock

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

global/certbot-dns-plugins.json

@@ -215,14 +215,6 @@
 		"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",