From dcee8a23def2aaa67e68e7973fa2d75885a51597 Mon Sep 17 00:00:00 2001 From: bgme Date: Fri, 2 Feb 2024 08:44:33 +0800 Subject: [PATCH] caddy: add ip sources plugins --- repo/caddy-bgme-git/PKGBUILD | 2 +- repo/caddy-bgme-git/lilac.yaml | 2 +- repo/caddy-bgme-git/main.go | 6 +++++- repo/caddy-bgme/PKGBUILD | 2 +- repo/caddy-bgme/lilac.yaml | 2 +- repo/caddy-bgme/main.go | 6 +++++- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/repo/caddy-bgme-git/PKGBUILD b/repo/caddy-bgme-git/PKGBUILD index a761f3a..c747f0d 100644 --- a/repo/caddy-bgme-git/PKGBUILD +++ b/repo/caddy-bgme-git/PKGBUILD @@ -33,7 +33,7 @@ source=( sha512sums=('SKIP' 'SKIP' 'SKIP' - '11dee54685686394ed30d84501a84101709961e391de142ac4b85e2983f6ec894c4f404b97f2d2484f83901e572eb9e89286ece966a590a347b755d8c34a3495' + 'c3f8800257362cb8b003bff9e1575a209b36f0387ff0055ed73dd1260748c6c459d15d584201042ec92e775d373ec526e6e3cfe8d3bc1f7ece5673901b94e453' 'c893d88fec89e37da6596030c8dce7103e7e575371e8542a24d2a0741e877358d85219f2d8ade9d6aa0f515efe1156a4badd9fef5f65f553a5b0c72330c4728f' '55ee8d3f8b14f9adddc7a1026addcea4f85b4bae4cd512fd4da2a5e8adaae4b6fd0f486d2e3847f75518f4710a897b4fca84e48ee15700b968bad762125c4742' '716da3f4edeb3561243aeaf5c32b01ff7a4ac810b6deba8364fb12a1f71b6a5278c34a97b289bcfdc48784679b942bf780f1f36d416a575791168c94b0d59fe0') diff --git a/repo/caddy-bgme-git/lilac.yaml b/repo/caddy-bgme-git/lilac.yaml index 863da17..c5a8917 100644 --- a/repo/caddy-bgme-git/lilac.yaml +++ b/repo/caddy-bgme-git/lilac.yaml @@ -12,4 +12,4 @@ update_on: - source: github github: caddyserver/caddy - source: manual - manual: 4.1 \ No newline at end of file + manual: 5 \ No newline at end of file diff --git a/repo/caddy-bgme-git/main.go b/repo/caddy-bgme-git/main.go index 72752c7..58f9bfe 100644 --- a/repo/caddy-bgme-git/main.go +++ b/repo/caddy-bgme-git/main.go @@ -37,13 +37,17 @@ import ( // naive proxy _ "github.com/caddyserver/forwardproxy" - // ip range + // ip sources _ "github.com/fvbommel/caddy-combine-ip-ranges" _ "github.com/fvbommel/caddy-dns-ip-range" _ "github.com/WeidiDeng/caddy-cloudflare-ip" _ "github.com/xcaddyplugins/caddy-trusted-cloudfront" _ "github.com/digilolnet/caddy-bunny-ip" + // match + _ "github.com/tuzzmaniandevil/caddy-dynamic-clientip" + _ "github.com/lanrat/caddy-dynamic-remoteip" + // WAF _ "github.com/corazawaf/coraza-caddy" diff --git a/repo/caddy-bgme/PKGBUILD b/repo/caddy-bgme/PKGBUILD index 5b8cc4d..8083fa5 100644 --- a/repo/caddy-bgme/PKGBUILD +++ b/repo/caddy-bgme/PKGBUILD @@ -34,7 +34,7 @@ source=( sha512sums=('SKIP' 'SKIP' 'SKIP' - '11dee54685686394ed30d84501a84101709961e391de142ac4b85e2983f6ec894c4f404b97f2d2484f83901e572eb9e89286ece966a590a347b755d8c34a3495' + 'c3f8800257362cb8b003bff9e1575a209b36f0387ff0055ed73dd1260748c6c459d15d584201042ec92e775d373ec526e6e3cfe8d3bc1f7ece5673901b94e453' 'c893d88fec89e37da6596030c8dce7103e7e575371e8542a24d2a0741e877358d85219f2d8ade9d6aa0f515efe1156a4badd9fef5f65f553a5b0c72330c4728f' '55ee8d3f8b14f9adddc7a1026addcea4f85b4bae4cd512fd4da2a5e8adaae4b6fd0f486d2e3847f75518f4710a897b4fca84e48ee15700b968bad762125c4742' '716da3f4edeb3561243aeaf5c32b01ff7a4ac810b6deba8364fb12a1f71b6a5278c34a97b289bcfdc48784679b942bf780f1f36d416a575791168c94b0d59fe0') diff --git a/repo/caddy-bgme/lilac.yaml b/repo/caddy-bgme/lilac.yaml index 8f94a3a..307d8a1 100644 --- a/repo/caddy-bgme/lilac.yaml +++ b/repo/caddy-bgme/lilac.yaml @@ -11,4 +11,4 @@ update_on: github: caddyserver/caddy use_latest_release: true - source: manual - manual: 4.1 \ No newline at end of file + manual: 5 \ No newline at end of file diff --git a/repo/caddy-bgme/main.go b/repo/caddy-bgme/main.go index 72752c7..58f9bfe 100644 --- a/repo/caddy-bgme/main.go +++ b/repo/caddy-bgme/main.go @@ -37,13 +37,17 @@ import ( // naive proxy _ "github.com/caddyserver/forwardproxy" - // ip range + // ip sources _ "github.com/fvbommel/caddy-combine-ip-ranges" _ "github.com/fvbommel/caddy-dns-ip-range" _ "github.com/WeidiDeng/caddy-cloudflare-ip" _ "github.com/xcaddyplugins/caddy-trusted-cloudfront" _ "github.com/digilolnet/caddy-bunny-ip" + // match + _ "github.com/tuzzmaniandevil/caddy-dynamic-clientip" + _ "github.com/lanrat/caddy-dynamic-remoteip" + // WAF _ "github.com/corazawaf/coraza-caddy"