Merge branch 'master' into knots

Co-authored-by: Markus Petzsch <markus@petzsch.eu>

Production/nginx.tmpl

@@ -514,7 +514,21 @@ server {
 	listen [::]:80 {{ $default_server }};
 	{{ end }}
 	access_log /var/log/nginx/access.log vhost;
-	return 301 https://$host$request_uri;
+
+	# Allow acme challenge requests without redirect
+	location ^~ /.well-known/acme-challenge/ {
+		auth_basic off;
+		auth_request off;
+		allow all;
+		root /usr/share/nginx/html;
+		try_files $uri =404;
+		break;
+	}
+
+	# Redirect all other requests to HTTPS
+	location / {
+		return 301 https://$host$request_uri;
+	}
 }
 {{ end }}
 

docker-compose-generator/docker-fragments/bitcoinknots.yml

@@ -4,7 +4,7 @@ services:
   bitcoind:
     restart: unless-stopped
     container_name: btcpayserver_bitcoind
-    image: ghcr.io/retropex/bitcoin:btcpay-28.1
+    image: btcpayserver/bitcoinknots:28.1
     environment:
       BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest}
       CREATE_WALLET: "false"