Merge branch 'NginxProxyManager:develop' into develop

Use previous version of powerdns image, newer version is broken
Fix incorrect test folder in ci results
2025-10-05 20:30:10 +00:00 · 2025-01-10 18:57:51 +00:00 · 2025-01-07 10:30:08 +10:00 · 2025-01-07 08:13:04 +10:00 · 2025-01-07 07:54:44 +10:00 · 2024-12-22 01:44:52 +01:00
5 changed files with 15 additions and 7 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/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'
--- a/docker/rootfs/etc/nginx/conf.d/include/force-ssl.conf
+++ b/docker/rootfs/etc/nginx/conf.d/include/force-ssl.conf
@@ -2,7 +2,7 @@ set $test "";
 if ($scheme = "http") {
 	set $test "H";
 }
-if ($request_uri = /.well-known/acme-challenge/test-challenge) {
+if ($request_uri ~ "^\/\.well-known\/acme-challenge\/(.*)") {
 	set $test "${test}T";
 }
 if ($test = H) {
--- 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
EDIflyer	f5373dd9cc	Merge branch 'NginxProxyManager:develop' into develop	2025-01-10 18:57:51 +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
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
EDIflyer	be5903f6c7	Merge branch 'NginxProxyManager:develop' into develop	2024-11-07 21:28:24 +00:00
EDIflyer	2bb99e68d8	Update force-ssl.conf Revised as per PR discussion.	2024-06-11 07:59:38 +01:00
EDIflyer	2d65d672c8	Merge branch 'develop' into develop	2024-06-10 20:10:42 +01:00
EDIflyer	2e528348b7	fix regex as per @lbogdan in https://github.com/NginxProxyManager/nginx-proxy-manager/pull/3121#discussion_r1621959578	2024-05-31 12:16:18 +01:00
EDIflyer	013310ded0	LetsEncrypt ACME redirect issue fixes #2881	2023-08-13 16:44:58 +01:00