From fb338fd6b580338ab103607868ed12a7a77646fb Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 8 May 2026 20:45:48 +0200 Subject: [PATCH 1/7] skip wildcard --- updatessl.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/updatessl.sh b/updatessl.sh index 7f27047..a8dd796 100644 --- a/updatessl.sh +++ b/updatessl.sh @@ -15,6 +15,9 @@ updatessl() { if grep ACME_DOMAINS $DEFAULT_CONF ; then for d_list in $(grep ACME_DOMAINS $DEFAULT_CONF | cut -d ' ' -f 2); do + if echo "$d_list" | grep '*'; then + continue; + fi d=$(echo "$d_list" | cut -d , -f 1) $ACME_BIN --issue --server letsencrypt -k ec-256 \ -d $d_list \ From caa25efc6aa69742c7e6cdc5c4651b2cee78af51 Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 8 May 2026 21:02:19 +0200 Subject: [PATCH 2/7] update --- .github/workflows/dockerhub.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index 4b5b56e..9c35f09 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -17,7 +17,7 @@ jobs: - name: Get Docker tags for Debian based image id: docker_meta_debian - uses: docker/metadata-action@v5 + uses: docker/metadata-action@v6 with: images: | neilpang/letsproxy @@ -26,20 +26,20 @@ jobs: type=ref,event=branch - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push the Debian based image id: docker_build_debian - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: file: Dockerfile platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/s390x @@ -61,7 +61,7 @@ jobs: - name: Get Docker tags for Alpine based image id: docker_meta_alpine - uses: docker/metadata-action@v5 + uses: docker/metadata-action@v6 with: images: | neilpang/letsproxy @@ -71,20 +71,20 @@ jobs: flavor: latest=false - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push the Alpine based image id: docker_build_alpine - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: file: Dockerfile.alpine platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/s390x From b6ebc5b2952d80a3ac5fd4fb2a363eefbff351af Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 8 May 2026 21:46:08 +0200 Subject: [PATCH 3/7] update --- nginx.tmpl | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/nginx.tmpl b/nginx.tmpl index af06d0f..96c9036 100644 --- a/nginx.tmpl +++ b/nginx.tmpl @@ -254,9 +254,11 @@ server { server { server_name _; # This is just an invalid value which will never trigger on a real hostname. server_tokens off; - listen {{ $external_https_port }} ssl http2; + listen {{ $external_https_port }} ssl; + http2 on; {{ if $enable_ipv6 }} - listen [::]:{{ $external_https_port }} ssl http2; + listen [::]:{{ $external_https_port }} ssl; + http2 on; {{ end }} {{ $access_log }} include /etc/nginx/vhost.d/default; @@ -362,12 +364,15 @@ server { {{ if $server_tokens }} server_tokens {{ $server_tokens }}; {{ end }} - listen {{ $external_https_port }} ssl http2 {{ $default_server }}; + listen {{ $external_https_port }} ssl {{ $default_server }}; + http2 on; {{ if eq $enable_socks "true" }} - listen unix:/etc/nginx/socks/{{ $host }}.{{ $external_https_port }}.sock ssl http2 {{ $default_server }}; + listen unix:/etc/nginx/socks/{{ $host }}.{{ $external_https_port }}.sock ssl {{ $default_server }}; + http2 on; {{ end }} {{ if $enable_ipv6 }} - listen [::]:{{ $external_https_port }} ssl http2 {{ $default_server }}; + listen [::]:{{ $external_https_port }} ssl {{ $default_server }}; + http2 on; {{ end }} {{ $access_log }} @@ -488,12 +493,15 @@ server { {{ if $server_tokens }} server_tokens {{ $server_tokens }}; {{ end }} - listen {{ $external_https_port }} ssl http2 {{ $default_server }}; + listen {{ $external_https_port }} ssl {{ $default_server }}; + http2 on; {{ if eq $enable_socks "true" }} - listen unix:/etc/nginx/socks/{{ $host }}.{{ $external_https_port }}.sock ssl http2 {{ $default_server }}; + listen unix:/etc/nginx/socks/{{ $host }}.{{ $external_https_port }}.sock ssl {{ $default_server }}; + http2 on; {{ end }} {{ if $enable_ipv6 }} - listen [::]:{{ $external_https_port }} ssl http2 {{ $default_server }}; + listen [::]:{{ $external_https_port }} ssl {{ $default_server }}; + http2 on; {{ end }} {{ $access_log }} include /etc/nginx/vhost.d/default; From ae21499c953a11a8528c5ff5191ef2e50feba6b9 Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 8 May 2026 22:15:47 +0200 Subject: [PATCH 4/7] fix --- nginx.tmpl | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/nginx.tmpl b/nginx.tmpl index 96c9036..ad8cd6e 100644 --- a/nginx.tmpl +++ b/nginx.tmpl @@ -255,11 +255,11 @@ server { server_name _; # This is just an invalid value which will never trigger on a real hostname. server_tokens off; listen {{ $external_https_port }} ssl; - http2 on; {{ if $enable_ipv6 }} listen [::]:{{ $external_https_port }} ssl; - http2 on; {{ end }} + http2 on; + {{ $access_log }} include /etc/nginx/vhost.d/default; location / { @@ -365,15 +365,14 @@ server { server_tokens {{ $server_tokens }}; {{ end }} listen {{ $external_https_port }} ssl {{ $default_server }}; - http2 on; {{ if eq $enable_socks "true" }} listen unix:/etc/nginx/socks/{{ $host }}.{{ $external_https_port }}.sock ssl {{ $default_server }}; - http2 on; {{ end }} {{ if $enable_ipv6 }} listen [::]:{{ $external_https_port }} ssl {{ $default_server }}; - http2 on; {{ end }} + http2 on; + {{ $access_log }} {{ template "ssl_policy" (dict "ssl_policy" $ssl_policy) }} @@ -494,15 +493,14 @@ server { server_tokens {{ $server_tokens }}; {{ end }} listen {{ $external_https_port }} ssl {{ $default_server }}; - http2 on; {{ if eq $enable_socks "true" }} listen unix:/etc/nginx/socks/{{ $host }}.{{ $external_https_port }}.sock ssl {{ $default_server }}; - http2 on; {{ end }} {{ if $enable_ipv6 }} listen [::]:{{ $external_https_port }} ssl {{ $default_server }}; - http2 on; {{ end }} + http2 on; + {{ $access_log }} include /etc/nginx/vhost.d/default; location / { From 2fb60f10c8ae11caa68290e534086703f04230a1 Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 8 May 2026 22:21:22 +0200 Subject: [PATCH 5/7] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- nginx.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.tmpl b/nginx.tmpl index ad8cd6e..975c748 100644 --- a/nginx.tmpl +++ b/nginx.tmpl @@ -258,8 +258,8 @@ server { {{ if $enable_ipv6 }} listen [::]:{{ $external_https_port }} ssl; {{ end }} - http2 on; - + http2 on; + {{ $access_log }} include /etc/nginx/vhost.d/default; location / { From d6be403a48e3f79a7c814bd2e7c8390fbb012acb Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 8 May 2026 22:21:32 +0200 Subject: [PATCH 6/7] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- nginx.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.tmpl b/nginx.tmpl index 975c748..9beb371 100644 --- a/nginx.tmpl +++ b/nginx.tmpl @@ -371,8 +371,8 @@ server { {{ if $enable_ipv6 }} listen [::]:{{ $external_https_port }} ssl {{ $default_server }}; {{ end }} - http2 on; - + http2 on; + {{ $access_log }} {{ template "ssl_policy" (dict "ssl_policy" $ssl_policy) }} From 0d1e33827f5bb12cdc2fb97a89bae626fdd0dc74 Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 8 May 2026 22:21:42 +0200 Subject: [PATCH 7/7] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- nginx.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.tmpl b/nginx.tmpl index 9beb371..5c8e535 100644 --- a/nginx.tmpl +++ b/nginx.tmpl @@ -499,8 +499,8 @@ server { {{ if $enable_ipv6 }} listen [::]:{{ $external_https_port }} ssl {{ $default_server }}; {{ end }} - http2 on; - + http2 on; + {{ $access_log }} include /etc/nginx/vhost.d/default; location / {