Skip to content

Dev #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neilpang merged 3 commits into from
May 8, 2026
Merged

Dev #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb338fd
skip wildcard
May 8, 2026
caa25ef
update
May 8, 2026
b6ebc5b
update
May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/dockerhub.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
24 changes: 16 additions & 8 deletions nginx.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 }}
Comment on lines +367 to 376
{{ $access_log }}

Expand Down Expand Up @@ -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 }}
Comment on lines +496 to 505
{{ $access_log }}
include /etc/nginx/vhost.d/default;
Expand Down
3 changes: 3 additions & 0 deletions updatessl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down