Merge branch 'develop' into develop

fix regex as per @lbogdan in https://github.com/NginxProxyManager/nginx-proxy-manager/pull/3121#discussion_r1621959578
LetsEncrypt ACME redirect issue fixes #2881
2025-10-04 20:00:12 +00:00 · 2024-06-10 20:10:42 +01:00 · 2024-05-31 12:16:18 +01:00 · 2023-08-13 16:44:58 +01:00
1 changed files with 8 additions and 1 deletions
--- a/docker/rootfs/etc/nginx/conf.d/include/force-ssl.conf
+++ b/docker/rootfs/etc/nginx/conf.d/include/force-ssl.conf
@@ -2,9 +2,16 @@ 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) {
 	return 301 https://$host$request_uri;
 }
+if ($request_uri !~ "^\/\.well-known\/acme-challenge\/(.*)") {
+        set $FORCE "${FORCE}D";
+}
+# If we are http and outside the LetsEncrypt directories redirect to https via 301
+if ($FORCE = HD) {
+        return 301 https://$host$request_uri;
+}
Author	SHA1	Message	Date
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