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 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; 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 \