diff --git a/repo/caddy-bgme-git/PKGBUILD b/repo/caddy-bgme-git/PKGBUILD index b3338aa..a0138fa 100644 --- a/repo/caddy-bgme-git/PKGBUILD +++ b/repo/caddy-bgme-git/PKGBUILD @@ -29,15 +29,13 @@ source=( caddy.tmpfiles Caddyfile ) -sha512sums=( - 'SKIP' - 'SKIP' - 'SKIP' - '2dfa570884b3061f5c4e327d4f8d7bc6483822eaff95a480f8e301c2a9f0fdfb987b9d7b91b26e5389489d8862405fdc01cf6c7dd02910643911b16409410148' - 'c893d88fec89e37da6596030c8dce7103e7e575371e8542a24d2a0741e877358d85219f2d8ade9d6aa0f515efe1156a4badd9fef5f65f553a5b0c72330c4728f' - '55ee8d3f8b14f9adddc7a1026addcea4f85b4bae4cd512fd4da2a5e8adaae4b6fd0f486d2e3847f75518f4710a897b4fca84e48ee15700b968bad762125c4742' - '716da3f4edeb3561243aeaf5c32b01ff7a4ac810b6deba8364fb12a1f71b6a5278c34a97b289bcfdc48784679b942bf780f1f36d416a575791168c94b0d59fe0' -) +sha512sums=('SKIP' + 'SKIP' + 'SKIP' + '98b075824f5af08d04e368db837e286b4a34f0a272fb97ce535c7b0aa596ca74e271dbd828c1fb248357205df799923f8f4824eb1f618646b73b9adc87584cbc' + 'c893d88fec89e37da6596030c8dce7103e7e575371e8542a24d2a0741e877358d85219f2d8ade9d6aa0f515efe1156a4badd9fef5f65f553a5b0c72330c4728f' + '55ee8d3f8b14f9adddc7a1026addcea4f85b4bae4cd512fd4da2a5e8adaae4b6fd0f486d2e3847f75518f4710a897b4fca84e48ee15700b968bad762125c4742' + '716da3f4edeb3561243aeaf5c32b01ff7a4ac810b6deba8364fb12a1f71b6a5278c34a97b289bcfdc48784679b942bf780f1f36d416a575791168c94b0d59fe0') pkgver() { cd "${_pkgname}-git" @@ -53,7 +51,7 @@ prepare() { cd ${_pkgname} cp ../main.go . go mod init caddy - sed -i -e '$a replace github.com/caddyserver/forwardproxy => ../forwardproxy' go.mod + go mod edit -replace "github.com/caddyserver/forwardproxy=../forwardproxy" go get github.com/caddyserver/caddy/v2@${_gitcommit} go mod tidy diff --git a/repo/caddy-bgme-git/lilac.yaml b/repo/caddy-bgme-git/lilac.yaml index 14294d4..c033195 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: 1 \ No newline at end of file + manual: 2 \ No newline at end of file diff --git a/repo/caddy-bgme-git/main.go b/repo/caddy-bgme-git/main.go index cfba93a..5769953 100644 --- a/repo/caddy-bgme-git/main.go +++ b/repo/caddy-bgme-git/main.go @@ -59,7 +59,7 @@ import ( // storage _ "github.com/silinternational/certmagic-storage-dynamodb/v3" - - "github.com/mohammed90/caddy-encrypted-storage" + _ "github.com/mohammed90/caddy-encrypted-storage" // geoip _ "github.com/zhangjiayin/caddy-geoip2" diff --git a/repo/caddy-bgme/PKGBUILD b/repo/caddy-bgme/PKGBUILD index 6750f25..7712b37 100644 --- a/repo/caddy-bgme/PKGBUILD +++ b/repo/caddy-bgme/PKGBUILD @@ -34,7 +34,7 @@ source=( sha512sums=('SKIP' 'SKIP' 'SKIP' - '2dfa570884b3061f5c4e327d4f8d7bc6483822eaff95a480f8e301c2a9f0fdfb987b9d7b91b26e5389489d8862405fdc01cf6c7dd02910643911b16409410148' + '98b075824f5af08d04e368db837e286b4a34f0a272fb97ce535c7b0aa596ca74e271dbd828c1fb248357205df799923f8f4824eb1f618646b73b9adc87584cbc' 'c893d88fec89e37da6596030c8dce7103e7e575371e8542a24d2a0741e877358d85219f2d8ade9d6aa0f515efe1156a4badd9fef5f65f553a5b0c72330c4728f' '55ee8d3f8b14f9adddc7a1026addcea4f85b4bae4cd512fd4da2a5e8adaae4b6fd0f486d2e3847f75518f4710a897b4fca84e48ee15700b968bad762125c4742' '716da3f4edeb3561243aeaf5c32b01ff7a4ac810b6deba8364fb12a1f71b6a5278c34a97b289bcfdc48784679b942bf780f1f36d416a575791168c94b0d59fe0') @@ -49,7 +49,7 @@ prepare() { cd ${_pkgname} cp ../main.go . go mod init caddy - sed -i -e '$a replace github.com/caddyserver/forwardproxy => ../forwardproxy' go.mod + go mod edit -replace "github.com/caddyserver/forwardproxy=../forwardproxy" go get github.com/caddyserver/caddy/v2@${_gitcommit} go mod tidy diff --git a/repo/caddy-bgme/lilac.yaml b/repo/caddy-bgme/lilac.yaml index c33cd02..c1380ee 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: 1 \ No newline at end of file + manual: 2 \ No newline at end of file diff --git a/repo/caddy-bgme/main.go b/repo/caddy-bgme/main.go index cfba93a..5769953 100644 --- a/repo/caddy-bgme/main.go +++ b/repo/caddy-bgme/main.go @@ -59,7 +59,7 @@ import ( // storage _ "github.com/silinternational/certmagic-storage-dynamodb/v3" - - "github.com/mohammed90/caddy-encrypted-storage" + _ "github.com/mohammed90/caddy-encrypted-storage" // geoip _ "github.com/zhangjiayin/caddy-geoip2"