Merge branch 'master' into dev

Author: neilpang

.github/workflows/dockerhub.yml

@@ -42,7 +42,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           file: Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/s390x
           push: true
           tags: ${{ steps.docker_meta_debian.outputs.tags }}
           labels: ${{ steps.docker_meta_debian.outputs.labels }}
@@ -87,10 +87,10 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           file: Dockerfile.alpine
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/s390x
           push: true
           tags: ${{ steps.docker_meta_alpine.outputs.tags }}
           labels: ${{ steps.docker_meta_alpine.outputs.labels }}
 
       - name: Images digests
-        run: echo ${{ steps.docker_build_alpine.outputs.digest }}
+        run: echo ${{ steps.docker_build_alpine.outputs.digest }}

nginx.tmpl

@@ -345,15 +345,7 @@ server {
 	{{ end }}
 	{{ $access_log }}
 
-	# Do not HTTPS redirect Let'sEncrypt ACME challenge
-	location ^~ /.well-known/acme-challenge/ {
-		auth_basic off;
-		auth_request off;
-		allow all;
-		root /usr/share/nginx/html;
-		try_files $uri =404;
-		break;
-	}
+
 
 	location / {
 		{{ if eq $external_https_port "443" }}