Date: Tue, 20 Sep 2022 20:50:52 GMT From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4d6de2861504 - main - www/caddy: Update to 2.6.0 Message-ID: <202209202050.28KKoq4C019386@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=4d6de2861504c1c82b736036b9bca29668417885 commit 4d6de2861504c1c82b736036b9bca29668417885 Author: Adam Weinberger <adamw@FreeBSD.org> AuthorDate: 2022-09-20 20:45:59 +0000 Commit: Adam Weinberger <adamw@FreeBSD.org> CommitDate: 2022-09-20 20:50:48 +0000 www/caddy: Update to 2.6.0 Also, improve the rc(8) script with updates by scf, allowing proper daemon shutdown regardless of whether the admin API is enabled. 2.6.0 is a significant update, bringing automatic HTTP/3 (QUIC) support, a fully abstracted fileserver (serve static files from a database, a tarball, a script, etc.), and lots more. Extensive update notes: https://github.com/caddyserver/caddy/releases/tag/v2.6.0 --- www/caddy/Makefile | 7 +- www/caddy/distinfo | 230 ++--------------------------------------------- www/caddy/files/caddy.in | 69 ++++++++------ www/caddy/pkg-descr | 2 +- 4 files changed, 52 insertions(+), 256 deletions(-) diff --git a/www/caddy/Makefile b/www/caddy/Makefile index 20dcfa23aeff..47795b2e1e67 100644 --- a/www/caddy/Makefile +++ b/www/caddy/Makefile @@ -1,7 +1,6 @@ PORTNAME= caddy DISTVERSIONPREFIX= v -DISTVERSION= 2.5.2 -PORTREVISION= 3 +DISTVERSION= 2.6.0 CATEGORIES= www DIST_SUBDIR= caddy @@ -23,9 +22,9 @@ PLIST_FILES= bin/${PORTNAME} \ GO_TARGET= ./cmd/caddy # If go.mod is sufficient: -# GO_MODULE= github.com/caddyserver/caddy/v2 +GO_MODULE= github.com/caddyserver/caddy/v2 # If modules must be specified manually: -.include "${.CURDIR}/modules.mk" +#.include "${.CURDIR}/modules.mk" post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} diff --git a/www/caddy/distinfo b/www/caddy/distinfo index 1e49d01b5a07..f0ac65bed3a1 100644 --- a/www/caddy/distinfo +++ b/www/caddy/distinfo @@ -1,225 +1,5 @@ -TIMESTAMP = 1659628335 -SHA256 (caddy/caddyserver-caddy-v2.5.2_GH0.tar.gz) = 6a3e03774658af8009c0ece287301d73c1ea961d01e6ef7c6f44962e4349f5e5 -SIZE (caddy/caddyserver-caddy-v2.5.2_GH0.tar.gz) = 538564 -SHA256 (caddy/AndreasBriese-bbloom-46b345b51c96_GH0.tar.gz) = 49b41b2b20e73f31091222e4a6abf12762231cbad9de642d2227c16dae29b4ff -SIZE (caddy/AndreasBriese-bbloom-46b345b51c96_GH0.tar.gz) = 8005 -SHA256 (caddy/BurntSushi-toml-v1.2.0_GH0.tar.gz) = 9b1d4e09cc3f2e6f64245efffbd3a3b18a6a04d7e477b134d2c4fde19c922019 -SIZE (caddy/BurntSushi-toml-v1.2.0_GH0.tar.gz) = 96597 -SHA256 (caddy/FiloSottile-edwards25519-v1.0.0-rc.1_GH0.tar.gz) = 594002138a9b9e1c0eb114ad27ea473442a71249afe401bb5a77c7f0ff59f35a -SIZE (caddy/FiloSottile-edwards25519-v1.0.0-rc.1_GH0.tar.gz) = 39128 -SHA256 (caddy/Masterminds-goutils-v1.1.1_GH0.tar.gz) = 6eed023c54f386a71f360e19d34f7a43e640ac44dfc39c22ad4afd7ae04aaa3d -SIZE (caddy/Masterminds-goutils-v1.1.1_GH0.tar.gz) = 14847 -SHA256 (caddy/Masterminds-semver-v3.1.1_GH0.tar.gz) = d029a39800f201d5b95ec5dbf653e5b20aab757783a6876be1b3017d1c4a444f -SIZE (caddy/Masterminds-semver-v3.1.1_GH0.tar.gz) = 24506 -SHA256 (caddy/Masterminds-sprig-v3.2.2_GH0.tar.gz) = 877f3d46e9eadec5644944ac265dd960f58f2b77355b636b2c0a3308b9a0e6ec -SIZE (caddy/Masterminds-sprig-v3.2.2_GH0.tar.gz) = 55500 -SHA256 (caddy/alecthomas-chroma-v0.10.0_GH0.tar.gz) = 98a517ae99f48e3b54d5c8cd7473d5c544f51bee7a4be17f5175736fce37da56 -SIZE (caddy/alecthomas-chroma-v0.10.0_GH0.tar.gz) = 798272 -SHA256 (caddy/antlr-antlr4-f25a4f6275ed_GH0.tar.gz) = 4f64ea59cfd452b3033c3db241c84926380370353b54d0328b05c04bd236d9e0 -SIZE (caddy/antlr-antlr4-f25a4f6275ed_GH0.tar.gz) = 4601031 -SHA256 (caddy/aryann-difflib-ff5ff6dc229b_GH0.tar.gz) = 9dc3eade691cf335fb741d0fa83016764c4c1c4f6a99f7f4062bc1058c7a1c68 -SIZE (caddy/aryann-difflib-ff5ff6dc229b_GH0.tar.gz) = 5311 -SHA256 (caddy/beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825 -SIZE (caddy/beorn7-perks-v1.0.1_GH0.tar.gz) = 10867 -SHA256 (caddy/caddyserver-certmagic-v0.16.2_GH0.tar.gz) = 702c66ba251c83e23303410f5e171f0299f78b8278f3dfab19f90fbff6964108 -SIZE (caddy/caddyserver-certmagic-v0.16.2_GH0.tar.gz) = 108873 -SHA256 (caddy/cenkalti-backoff-v4.1.2_GH0.tar.gz) = 22b1fbf617363c3230ccb01cc2708148c7c8f91de332fe923b02da352ebbdd34 -SIZE (caddy/cenkalti-backoff-v4.1.2_GH0.tar.gz) = 9826 -SHA256 (caddy/cespare-xxhash-v1.1.0_GH0.tar.gz) = 9418be390574092f0ca989b9ae2f5450270ead8125a635a100850b28c8c9c495 -SIZE (caddy/cespare-xxhash-v1.1.0_GH0.tar.gz) = 8200 -SHA256 (caddy/cespare-xxhash-v2.1.2_GH0.tar.gz) = 471399cfcf0b1bd188add8d34435b91e7011cedbfe76e29687803a9d74320352 -SIZE (caddy/cespare-xxhash-v2.1.2_GH0.tar.gz) = 11244 -SHA256 (caddy/cheekybits-genny-v1.0.0_GH0.tar.gz) = 6982bf513333fb3ee3e6e0633500a3800fb6a3d6beb9e6c6084a96c85a49dd73 -SIZE (caddy/cheekybits-genny-v1.0.0_GH0.tar.gz) = 15585 -SHA256 (caddy/chzyer-readline-2972be24d48e_GH0.tar.gz) = 8f425cfb33fce61a137866c0a88117c68f49de79a61a341353fc97339c6b74da -SIZE (caddy/chzyer-readline-2972be24d48e_GH0.tar.gz) = 36825 -SHA256 (caddy/cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 50537880d42fc28b9c2e9aaa36b137349d43cc73d46436a499f8c928cd2fc576 -SIZE (caddy/cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 52021 -SHA256 (caddy/dgraph-io-badger-v1.6.2_GH0.tar.gz) = 34dcd22a2a2fcb013eb8e8817c4375a1c38929eaad090a1e5ec066e4a0e1e2c1 -SIZE (caddy/dgraph-io-badger-v1.6.2_GH0.tar.gz) = 304997 -SHA256 (caddy/dgraph-io-badger-v2.2007.4_GH0.tar.gz) = c595c20a5134ce97aac1af59408d9486ca4528d39ec03aa974442d0c653a5eef -SIZE (caddy/dgraph-io-badger-v2.2007.4_GH0.tar.gz) = 348547 -SHA256 (caddy/dgraph-io-ristretto-41ebdbffecfd_GH0.tar.gz) = 23072e79f7805254d5e719800ce541990fcacc6ca9f910e981621debe109d611 -SIZE (caddy/dgraph-io-ristretto-41ebdbffecfd_GH0.tar.gz) = 277925 -SHA256 (caddy/dgryski-go-farm-a6ae2369ad13_GH0.tar.gz) = ae5ab67a14ec1339016b8a3ec6be36917a1d77a0fc2ff26d5b399c88958d161b -SIZE (caddy/dgryski-go-farm-a6ae2369ad13_GH0.tar.gz) = 27127 -SHA256 (caddy/dlclark-regexp2-v1.4.0_GH0.tar.gz) = 774718cb87c5cc7b954e4f17056f6a189c8d542ecbf989330296bc7e3885851b -SIZE (caddy/dlclark-regexp2-v1.4.0_GH0.tar.gz) = 205882 -SHA256 (caddy/dustin-go-humanize-afde56e7acac_GH0.tar.gz) = 30086bdc35bb19afafd7fe2f1b111b28aea3480f66e0fffd59ba25762c8fc89d -SIZE (caddy/dustin-go-humanize-afde56e7acac_GH0.tar.gz) = 17281 -SHA256 (caddy/etcd-io-bbolt-v1.3.6_GH0.tar.gz) = a2e524f7f32c44fa0765de192ac0789c585010cadd2c2ddcf9518e858a96ec1f -SIZE (caddy/etcd-io-bbolt-v1.3.6_GH0.tar.gz) = 98025 -SHA256 (caddy/felixge-httpsnoop-v1.0.2_GH0.tar.gz) = 6490e28de62538036db58ad062395cc780fafebd87c0bf761f9b581fc3449d6c -SIZE (caddy/felixge-httpsnoop-v1.0.2_GH0.tar.gz) = 11600 -SHA256 (caddy/go-chi-chi-v4.1.2_GH0.tar.gz) = 9382097218bb6922ecc26707fb683a4568825010fb0cc5168621b88661d5e42e -SIZE (caddy/go-chi-chi-v4.1.2_GH0.tar.gz) = 75928 -SHA256 (caddy/go-kit-kit-v0.10.0_GH0.tar.gz) = c0fac2e37b981e4c18e4f210b92e1393bd59dadd7c7fc043ec46d1c9834eba85 -SIZE (caddy/go-kit-kit-v0.10.0_GH0.tar.gz) = 274801 -SHA256 (caddy/go-logfmt-logfmt-v0.5.0_GH0.tar.gz) = 76727000951c187d058289d8e83d3e2ad480a5d44c7c83b025b78b7eb6bf0258 -SIZE (caddy/go-logfmt-logfmt-v0.5.0_GH0.tar.gz) = 11745 -SHA256 (caddy/go-logr-logr-v1.2.2_GH0.tar.gz) = 558ff42c945b46671e030275f05c928d157479b7b8221e0ca992e9c672bb9968 -SIZE (caddy/go-logr-logr-v1.2.2_GH0.tar.gz) = 37100 -SHA256 (caddy/go-logr-stdr-v1.2.2_GH0.tar.gz) = 37d975b280d884ca0d55a800bc6e47314b6e86268e56254f9d15d19ca9404eb8 -SIZE (caddy/go-logr-stdr-v1.2.2_GH0.tar.gz) = 9098 -SHA256 (caddy/go-sql-driver-mysql-v1.6.0_GH0.tar.gz) = 25233aea6418ca7e2e8d83f1bf4f498ef7f79c8c0fee1dc2a8ba623372574b28 -SIZE (caddy/go-sql-driver-mysql-v1.6.0_GH0.tar.gz) = 94168 -SHA256 (caddy/go-yaml-yaml-v3.0.1_GH0.tar.gz) = cf05411540d3e6ef8f1fd88434b34f94cedaceb540329031d80e23b74540c4e5 -SIZE (caddy/go-yaml-yaml-v3.0.1_GH0.tar.gz) = 91173 -SHA256 (caddy/golang-crypto-ae2d96664a29_GH0.tar.gz) = 6b2031688c3ae29f96032c0e3e99a21858b8e5cbd4e9903441eec52cae9a698f -SIZE (caddy/golang-crypto-ae2d96664a29_GH0.tar.gz) = 1630594 -SHA256 (caddy/golang-net-69896b714898_GH0.tar.gz) = 65edfdf8fe64a93c963ed2d29ee0d96d4bf568f400ba0aa7c8d4c4a0f35c8b22 -SIZE (caddy/golang-net-69896b714898_GH0.tar.gz) = 1228069 -SHA256 (caddy/golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3 -SIZE (caddy/golang-protobuf-v1.5.2_GH0.tar.gz) = 171702 -SHA256 (caddy/golang-snappy-v0.0.4_GH0.tar.gz) = 77df678795596f9dfecb5744deb984633d780460a7e9a59e0c7ecfe2052b644f -SIZE (caddy/golang-snappy-v0.0.4_GH0.tar.gz) = 66129 -SHA256 (caddy/golang-sys-05e143d24a9e_GH0.tar.gz) = d5b38530b298fb56c458b631b592f67e0d28692563d833176cc9c7422e45db34 -SIZE (caddy/golang-sys-05e143d24a9e_GH0.tar.gz) = 1303922 -SHA256 (caddy/golang-term-03fcf44c2211_GH0.tar.gz) = 1919967c8fbf15de9261a2315d90072357524ee557d7df106b426def02a8e5f3 -SIZE (caddy/golang-term-03fcf44c2211_GH0.tar.gz) = 14972 -SHA256 (caddy/golang-text-5bd84dd9b33b_GH0.tar.gz) = cda300bc590c52f2d5a98eecb4a1dbb9f529d62fc21c88445881ac2ae0113d2c -SIZE (caddy/golang-text-5bd84dd9b33b_GH0.tar.gz) = 8363403 -SHA256 (caddy/google-cel-go-v0.12.4_GH0.tar.gz) = 02d814212019e1d952e52b02ad67393baa2a216eb00a3b05092595bfd23e00a1 -SIZE (caddy/google-cel-go-v0.12.4_GH0.tar.gz) = 953113 -SHA256 (caddy/google-go-genproto-f16073e35f0c_GH0.tar.gz) = a42664db5442fd4dc4acac922949a735d37f44240394ab55a0d5ee3c9f8410d6 -SIZE (caddy/google-go-genproto-f16073e35f0c_GH0.tar.gz) = 9270161 -SHA256 (caddy/google-uuid-v1.3.0_GH0.tar.gz) = 7f7f37c47980e0afcc178a9ffc390bec29ed2371919b4c07658eb01791a7f921 -SIZE (caddy/google-uuid-v1.3.0_GH0.tar.gz) = 16210 -SHA256 (caddy/grpc-grpc-go-v1.38.0_GH0.tar.gz) = fd6a2e2ae9e810670fdb63d196275ddb171e7f99f3bb801a02dde973de2f557b -SIZE (caddy/grpc-grpc-go-v1.38.0_GH0.tar.gz) = 1253222 -SHA256 (caddy/grpc-ecosystem-grpc-gateway-v1.16.0_GH0.tar.gz) = 20ba8f2aeb4a580109357fffaa42f8400aba1155b95c8845e412287907e64379 -SIZE (caddy/grpc-ecosystem-grpc-gateway-v1.16.0_GH0.tar.gz) = 521578 -SHA256 (caddy/huandu-xstrings-v1.3.2_GH0.tar.gz) = 89eed037724f4a2e85da5217faa6d73ae317d066e0e5fd79670a142b83f5eb1b -SIZE (caddy/huandu-xstrings-v1.3.2_GH0.tar.gz) = 17911 -SHA256 (caddy/imdario-mergo-v0.3.12_GH0.tar.gz) = f0ad95fe47f1a9c15545fe3e8abf4364b8163a0f872ce25d6f6ae85e7c885302 -SIZE (caddy/imdario-mergo-v0.3.12_GH0.tar.gz) = 22319 -SHA256 (caddy/jackc-chunkreader-v2.0.1_GH0.tar.gz) = bf856bad6608fb7345707aba713a1d77eb984f1d217065738a12c97e37669be4 -SIZE (caddy/jackc-chunkreader-v2.0.1_GH0.tar.gz) = 3038 -SHA256 (caddy/jackc-pgconn-v1.10.1_GH0.tar.gz) = 7045b8e2059025229f1b1344d28289b753e0b1f1f6196adbcb10f07e56e10462 -SIZE (caddy/jackc-pgconn-v1.10.1_GH0.tar.gz) = 54190 -SHA256 (caddy/jackc-pgio-v1.0.0_GH0.tar.gz) = d36e367c877954acdc96b8cd1a0df417b4cfae80dae726474a8f0de3a68a68ab -SIZE (caddy/jackc-pgio-v1.0.0_GH0.tar.gz) = 1884 -SHA256 (caddy/jackc-pgpassfile-v1.0.0_GH0.tar.gz) = df8904662382e1d0064ec7a5a8c36c49264d7128cea923d597802ada8c5b9603 -SIZE (caddy/jackc-pgpassfile-v1.0.0_GH0.tar.gz) = 3254 -SHA256 (caddy/jackc-pgproto3-v2.2.0_GH0.tar.gz) = 752bf556fd414ca91e4ef0947c63a42566f46b9c26a4493deca7e9f135044f21 -SIZE (caddy/jackc-pgproto3-v2.2.0_GH0.tar.gz) = 23690 -SHA256 (caddy/jackc-pgservicefile-2b9c44734f2b_GH0.tar.gz) = dd6cf77deb2456b1c8e56875ed901a57eb887e63ae5de48f364906131275497e -SIZE (caddy/jackc-pgservicefile-2b9c44734f2b_GH0.tar.gz) = 2991 -SHA256 (caddy/jackc-pgtype-v1.9.0_GH0.tar.gz) = a6b67604990e8813101553ca5be89f13917c451e3dca3e7189ac35aa95dc95fa -SIZE (caddy/jackc-pgtype-v1.9.0_GH0.tar.gz) = 177338 -SHA256 (caddy/jackc-pgx-v4.14.0_GH0.tar.gz) = 70002159268a2f94c0dd7a52ebd059f9222e4c43c573a95e8bd013271e43c1dc -SIZE (caddy/jackc-pgx-v4.14.0_GH0.tar.gz) = 110518 -SHA256 (caddy/klauspost-compress-v1.15.9_GH0.tar.gz) = 20519b85f01606cf859e7cca086d6ac06ce85c9520a6bf30bcf6f8fb588bcb18 -SIZE (caddy/klauspost-compress-v1.15.9_GH0.tar.gz) = 24209358 -SHA256 (caddy/klauspost-cpuid-v1.2.5_GH0.tar.gz) = bec2ea696ec25a2577dd0996cbbc0675e57f242da61e4edad071983b65fed988 -SIZE (caddy/klauspost-cpuid-v1.2.5_GH0.tar.gz) = 360978 -SHA256 (caddy/klauspost-cpuid-v2.1.0_GH0.tar.gz) = d84f4a32142e45f56188b7f0a0d794cd3e1d505bdfa8868dfe82bb772d173929 -SIZE (caddy/klauspost-cpuid-v2.1.0_GH0.tar.gz) = 436975 -SHA256 (caddy/konsorten-go-windows-terminal-sequences-v1.0.3_GH0.tar.gz) = 0fe1169bb05476f0a3270866cdd9b39b7986a1dce556f6508046ac5f0c5ad8f3 -SIZE (caddy/konsorten-go-windows-terminal-sequences-v1.0.3_GH0.tar.gz) = 1983 -SHA256 (caddy/libdns-libdns-v0.2.1_GH0.tar.gz) = 3d4d534d1a04ec0890803c99d7f3a9c540c10afb0215831c2d2f9944c3e2f892 -SIZE (caddy/libdns-libdns-v0.2.1_GH0.tar.gz) = 5838 -SHA256 (caddy/lucas-clemente-quic-go-v0.28.1_GH0.tar.gz) = c6e1004ce9552a7ae90a5220c87337fd30dded7374d9e98bd5dd491466088bdd -SIZE (caddy/lucas-clemente-quic-go-v0.28.1_GH0.tar.gz) = 537395 -SHA256 (caddy/lunixbochs-vtclean-v1.0.0_GH0.tar.gz) = 38aa5c60284f77cbb4be1de4af8907ce66954ff1a11e4f910d02e0283ce13b33 -SIZE (caddy/lunixbochs-vtclean-v1.0.0_GH0.tar.gz) = 4213 -SHA256 (caddy/manifoldco-promptui-v0.9.0_GH0.tar.gz) = 84a72dfb56f61436a04fdde28f62b32aa07af75895e3423f199f7872aea43114 -SIZE (caddy/manifoldco-promptui-v0.9.0_GH0.tar.gz) = 25926 -SHA256 (caddy/marten-seemann-qpack-v0.2.1_GH0.tar.gz) = 4d8ee343223e2433119fce12d53e90d70e04953bff80a00aae8fa3b7dd888134 -SIZE (caddy/marten-seemann-qpack-v0.2.1_GH0.tar.gz) = 42738 -SHA256 (caddy/marten-seemann-qtls-go1-17-v0.1.2_GH0.tar.gz) = 4d7da89f6a894b0d0caf5749278f452c6f4222dc7550a7209a945d7a5e0011f8 -SIZE (caddy/marten-seemann-qtls-go1-17-v0.1.2_GH0.tar.gz) = 421878 -SHA256 (caddy/marten-seemann-qtls-go1-18-v0.1.2_GH0.tar.gz) = c32876730b1c8e3be6df18ac48c39500bf940d97db622c0cb7a219d04c2f2fab -SIZE (caddy/marten-seemann-qtls-go1-18-v0.1.2_GH0.tar.gz) = 422392 -SHA256 (caddy/marten-seemann-qtls-go1-19-v0.1.0-beta.1_GH0.tar.gz) = e1689e9c1ff5b8bb007402b1bc48c736db6df19763f147f71520a2ceb9cc8375 -SIZE (caddy/marten-seemann-qtls-go1-19-v0.1.0-beta.1_GH0.tar.gz) = 422893 -SHA256 (caddy/mattn-go-colorable-v0.1.8_GH0.tar.gz) = 1027954f9abbe06b6e117e3047af70204dd0eb4f8c27fcd459fb2574b279755f -SIZE (caddy/mattn-go-colorable-v0.1.8_GH0.tar.gz) = 9571 -SHA256 (caddy/mattn-go-isatty-v0.0.13_GH0.tar.gz) = d25318d3c4e174e1ffb5d90c9d3e6887cc050f76e403b7b3d6163f4338fac952 -SIZE (caddy/mattn-go-isatty-v0.0.13_GH0.tar.gz) = 4440 -SHA256 (caddy/matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b -SIZE (caddy/matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184 -SHA256 (caddy/mgutz-ansi-d51e80ef957d_GH0.tar.gz) = 91cc2a4b9179dca81b3169ad32d4ef854d043c268251abf9a004bf7606fe3222 -SIZE (caddy/mgutz-ansi-d51e80ef957d_GH0.tar.gz) = 5097 -SHA256 (caddy/mholt-acmez-v1.0.4_GH0.tar.gz) = 5dcb3fbfa71aae78cfe7f4275333bb6b403aa50abd7347f2a7beed05918f1d32 -SIZE (caddy/mholt-acmez-v1.0.4_GH0.tar.gz) = 52073 -SHA256 (caddy/micromdm-scep-v2.1.0_GH0.tar.gz) = 23ad4c46c7fa5813ad7e87d5e790fb0e3524bd1d128561dc8c96db8cfb1eafcd -SIZE (caddy/micromdm-scep-v2.1.0_GH0.tar.gz) = 64294 -SHA256 (caddy/miekg-dns-v1.1.46_GH0.tar.gz) = 621516f09dfc32b214cf0bf670554739b25e95c7cf9c6dd2965d68178ab398df -SIZE (caddy/miekg-dns-v1.1.46_GH0.tar.gz) = 204183 -SHA256 (caddy/mitchellh-copystructure-v1.2.0_GH0.tar.gz) = 0f3c6a9d91d695470c22acaba390878a03e3c106a453c4b0b8abebfb76c1a009 -SIZE (caddy/mitchellh-copystructure-v1.2.0_GH0.tar.gz) = 9951 -SHA256 (caddy/mitchellh-go-ps-v1.0.0_GH0.tar.gz) = c3ad0af6733915a83b54300427e6bca2a124bf16a5732c3f630b3ef53e4eef43 -SIZE (caddy/mitchellh-go-ps-v1.0.0_GH0.tar.gz) = 7610 -SHA256 (caddy/mitchellh-reflectwalk-v1.0.2_GH0.tar.gz) = 62ef93bcd6ef48e5dbb4b3aefffb44b7d7e1d56ab2aa8541734b8448ae9ef996 -SIZE (caddy/mitchellh-reflectwalk-v1.0.2_GH0.tar.gz) = 6854 -SHA256 (caddy/mozilla-services-pkcs7-33d05740a352_GH0.tar.gz) = d7af21e028258fd8967e34ac61b3ccd24c2f6005b11b8f8af6ff216fb8fff318 -SIZE (caddy/mozilla-services-pkcs7-33d05740a352_GH0.tar.gz) = 48543 -SHA256 (caddy/natefinch-lumberjack-v2.0.0_GH0.tar.gz) = 5817941b45096eb70b8114d7a4bf392ea47c4fe8030ff383ca54c67dfa0617bd -SIZE (caddy/natefinch-lumberjack-v2.0.0_GH0.tar.gz) = 12631 -SHA256 (caddy/open-telemetry-opentelemetry-go-v1.4.0_GH0.tar.gz) = 3ce2b187c810fdd501ae444074e2cdd087f3394250b7112a8a7e1aff51085471 -SIZE (caddy/open-telemetry-opentelemetry-go-v1.4.0_GH0.tar.gz) = 814228 -SHA256 (caddy/open-telemetry-opentelemetry-go-contrib-v1.4.0_GH0.tar.gz) = 4f3cadd652a3f0b995a2e7252c09efe3aebd28b6d913a8307b5fa963fa8a08e2 -SIZE (caddy/open-telemetry-opentelemetry-go-contrib-v1.4.0_GH0.tar.gz) = 772717 -SHA256 (caddy/open-telemetry-opentelemetry-proto-go-v0.12.0_GH0.tar.gz) = 365c83f1b5c78c798a8e4ebf2fe31c3076e42c578ad1a5502ccd955e4c63a7e8 -SIZE (caddy/open-telemetry-opentelemetry-proto-go-v0.12.0_GH0.tar.gz) = 63528 -SHA256 (caddy/pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608 -SIZE (caddy/pkg-errors-v0.9.1_GH0.tar.gz) = 13415 -SHA256 (caddy/prometheus-client_golang-v1.12.2_GH0.tar.gz) = ab01b65e6c24a41e856986076d0de2d38d379253eb78160edd8d8235f789c94a -SIZE (caddy/prometheus-client_golang-v1.12.2_GH0.tar.gz) = 197117 -SHA256 (caddy/prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12 -SIZE (caddy/prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986 -SHA256 (caddy/prometheus-common-v0.32.1_GH0.tar.gz) = de06f354e24dec3bfeba9a3bd43bd3170b4231dfff3cd338b688a6e8c8050af6 -SIZE (caddy/prometheus-common-v0.32.1_GH0.tar.gz) = 146585 -SHA256 (caddy/prometheus-procfs-v0.7.3_GH0.tar.gz) = 5514e8b18c38b6376a84c623d59735d4eefb61fb3a14eb1f45e0a4c848f14a2b -SIZE (caddy/prometheus-procfs-v0.7.3_GH0.tar.gz) = 178957 -SHA256 (caddy/protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 26218474bcf776ecf32d7d194c6bfaca8e7b4f0c087e5b595fd50fbb31409676 -SIZE (caddy/protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 1270215 -SHA256 (caddy/rs-xid-v1.2.1_GH0.tar.gz) = bb207227d5ae99bda71d38ae11e29b822c9b572223781bc282ad2f8e69002f2c -SIZE (caddy/rs-xid-v1.2.1_GH0.tar.gz) = 9553 -SHA256 (caddy/russross-blackfriday-v2.0.1_GH0.tar.gz) = 5a0f38a36b6f3b2d59b72d713451a895a4d3a4406b3533882483782e37797cff -SIZE (caddy/russross-blackfriday-v2.0.1_GH0.tar.gz) = 79613 -SHA256 (caddy/samfoo-ansi-b6bd2ded7189_GH0.tar.gz) = 01cb78eb5c20624c6a02d185584e1b6815495e2c915e441926d66772721e258f -SIZE (caddy/samfoo-ansi-b6bd2ded7189_GH0.tar.gz) = 4566 -SHA256 (caddy/shopspring-decimal-v1.2.0_GH0.tar.gz) = 59fa76645f63d7383d3f306fe2f7136d923e2aa514d9a9353938d9654b842f58 -SIZE (caddy/shopspring-decimal-v1.2.0_GH0.tar.gz) = 37755 -SHA256 (caddy/shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 7e11964980f9b8595c17bc8970f0174621afe464920e38df7f8d77e45058388f -SIZE (caddy/shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 2143 -SHA256 (caddy/sirupsen-logrus-v1.8.1_GH0.tar.gz) = e9492c08ac8f202b438ccfb992bf81b7860739cf8f2266958e0c574c7abfdd74 -SIZE (caddy/sirupsen-logrus-v1.8.1_GH0.tar.gz) = 47161 -SHA256 (caddy/slackhq-nebula-v1.5.2_GH0.tar.gz) = 391ac38161561690a65c0fa5ad65a2efb2d187323cc8ee84caa95fa24cb6c36a -SIZE (caddy/slackhq-nebula-v1.5.2_GH0.tar.gz) = 945337 -SHA256 (caddy/smallstep-certificates-v0.21.0_GH0.tar.gz) = 488c4b6f0d5fba6ccfffcfb37dcce683470ea7a08de42d8ea159c2d0b6826f61 -SIZE (caddy/smallstep-certificates-v0.21.0_GH0.tar.gz) = 17979712 -SHA256 (caddy/smallstep-cli-v0.21.0_GH0.tar.gz) = 0828315732784fba16fc75276506590a8e360b07bc0f59b3bce7e2a200416968 -SIZE (caddy/smallstep-cli-v0.21.0_GH0.tar.gz) = 1848328 -SHA256 (caddy/smallstep-cli-utils-v0.7.3_GH0.tar.gz) = 3edefe662a8a91bb6debbcf2eabd181c569ca3e92369a79a6d597ecbbdd7340d -SIZE (caddy/smallstep-cli-utils-v0.7.3_GH0.tar.gz) = 141597 -SHA256 (caddy/smallstep-crypto-v0.16.2_GH0.tar.gz) = 9096861735e0224d79d342b3865fbad9804df9b766a7ee1e599acb28826d4c8a -SIZE (caddy/smallstep-crypto-v0.16.2_GH0.tar.gz) = 167294 -SHA256 (caddy/smallstep-linkedca-v0.16.1_GH0.tar.gz) = e7f37855f379bb7224f081e168259bac7d62dda63d9c65d73b45923bc68cb452 -SIZE (caddy/smallstep-linkedca-v0.16.1_GH0.tar.gz) = 56106 -SHA256 (caddy/smallstep-nosql-v0.4.0_GH0.tar.gz) = 7645fdd1e85f7c387f052030e53d1a14be40267e0b7b225b90e44da41d07daeb -SIZE (caddy/smallstep-nosql-v0.4.0_GH0.tar.gz) = 33741 -SHA256 (caddy/smallstep-truststore-v0.11.0_GH0.tar.gz) = 9ad96f1cb66274b02aabe1f2497d160c3c8d48368b62f8a56e6892f1dc924fdb -SIZE (caddy/smallstep-truststore-v0.11.0_GH0.tar.gz) = 12971 -SHA256 (caddy/spf13-cast-v1.4.1_GH0.tar.gz) = 3d099a48b75a66ac52dbb473c93096076dca752af51087b8d163e15e5de721f8 -SIZE (caddy/spf13-cast-v1.4.1_GH0.tar.gz) = 13381 -SHA256 (caddy/square-go-jose-v2.6.0_GH0.tar.gz) = 0c1556d9675158342ca7ed875b3b40ea534861b96a5a75b1eb3f6637503b9a76 -SIZE (caddy/square-go-jose-v2.6.0_GH0.tar.gz) = 310320 -SHA256 (caddy/stoewer-go-strcase-v1.2.0_GH0.tar.gz) = 5015a14dc191baa9f0b606e755534ddc45742b81f9f4be88bd4e65d92f29937d -SIZE (caddy/stoewer-go-strcase-v1.2.0_GH0.tar.gz) = 5286 -SHA256 (caddy/tailscale-tscert-54bbcb9f74e2_GH0.tar.gz) = 501573ebd9f838bf25c1b40c7e9b8263309f1af9a01d8b793615edc7842a7000 -SIZE (caddy/tailscale-tscert-54bbcb9f74e2_GH0.tar.gz) = 13784 -SHA256 (caddy/uber-go-atomic-v1.9.0_GH0.tar.gz) = a6b11bb77c479298cdfdfdf2132975dbd975322b619451378cbdf731facd874a -SIZE (caddy/uber-go-atomic-v1.9.0_GH0.tar.gz) = 21331 -SHA256 (caddy/uber-go-multierr-v1.6.0_GH0.tar.gz) = f8a139a06fd70bbda0f089274bd723a00c33c5b269a696de4d6a8ab455a22717 -SIZE (caddy/uber-go-multierr-v1.6.0_GH0.tar.gz) = 12369 -SHA256 (caddy/uber-go-zap-v1.21.0_GH0.tar.gz) = 6e450b90a7d7893bd4a96043631e8b8fa95f5f3b72c9a102870e96b094b54371 -SIZE (caddy/uber-go-zap-v1.21.0_GH0.tar.gz) = 183660 -SHA256 (caddy/urfave-cli-v1.22.5_GH0.tar.gz) = 57138657dd61c81e21b52cfb1aa5c97ad5c9379197fa7fb550051e59056eb30f -SIZE (caddy/urfave-cli-v1.22.5_GH0.tar.gz) = 78125 -SHA256 (caddy/yuin-goldmark-highlighting-594be1970594_GH0.tar.gz) = b9c18dfbfb744654525ce4730a6f665622ab93b2d499bda8ea42e0a3bc89fae5 -SIZE (caddy/yuin-goldmark-highlighting-594be1970594_GH0.tar.gz) = 10048 -SHA256 (caddy/yuin-goldmark-v1.4.13_GH0.tar.gz) = 77292903086944782225e88417ca6c20e47a7ec6210ec3e6e04e89bdac65d995 -SIZE (caddy/yuin-goldmark-v1.4.13_GH0.tar.gz) = 257774 +TIMESTAMP = 1663700071 +SHA256 (go/www_caddy/caddy-v2.6.0/v2.6.0.mod) = 5f51daa4f2300632f7c4c5f071bf7b699cb0e19d93531f09b2b29cfe5233cb0d +SIZE (go/www_caddy/caddy-v2.6.0/v2.6.0.mod) = 6436 +SHA256 (go/www_caddy/caddy-v2.6.0/v2.6.0.zip) = 1bc6e0fc9f7cfcfce270d7287a5dfd8ba213c79791527a7ad363695cee3fa14a +SIZE (go/www_caddy/caddy-v2.6.0/v2.6.0.zip) = 794940 diff --git a/www/caddy/files/caddy.in b/www/caddy/files/caddy.in index 2515a29a3b5f..300a0ff23575 100644 --- a/www/caddy/files/caddy.in +++ b/www/caddy/files/caddy.in @@ -59,7 +59,7 @@ required_files="${caddy_config} ${command}" start_precmd="caddy_precmd" start_cmd="caddy_start" -stop_cmd="caddy_stop" +stop_precmd="caddy_prestop" # Extra Commands extra_commands="configtest reload" @@ -68,42 +68,59 @@ reload_cmd="caddy_command reload ${caddy_flags}" caddy_command() { - /usr/bin/su -m "${caddy_user}" -c "${command} $*" + /usr/bin/su -m "${caddy_user}" -c "${command} $*" } caddy_precmd() { - # Create required directories and set permissions - /usr/bin/install -d -m 755 -o "${caddy_user}" -g "${caddy_group}" ${caddy_directory} - /usr/bin/install -d -m 700 -o "${caddy_user}" -g "${caddy_group}" ${caddy_directory}/config - /usr/bin/install -d -m 700 -o "${caddy_user}" -g "${caddy_group}" ${caddy_directory}/data - /usr/bin/install -d -m 755 -o "${caddy_user}" -g "${caddy_group}" ${caddy_logdir} - /usr/bin/install -d -m 700 -o "${caddy_user}" -g "${caddy_group}" /var/run/caddy + # Create required directories and set permissions + /usr/bin/install -d -m 755 -o "${caddy_user}" -g "${caddy_group}" ${caddy_directory} + /usr/bin/install -d -m 700 -o "${caddy_user}" -g "${caddy_group}" ${caddy_directory}/config + /usr/bin/install -d -m 700 -o "${caddy_user}" -g "${caddy_group}" ${caddy_directory}/data + /usr/bin/install -d -m 755 -o "${caddy_user}" -g "${caddy_group}" ${caddy_logdir} + /usr/bin/install -d -m 700 -o "${caddy_user}" -g "${caddy_group}" /var/run/caddy + if [ -e ${caddy_logfile} ]; then + /bin/chmod 644 ${caddy_logfile} + /usr/sbin/chown root:wheel ${caddy_logfile} + else + /usr/bin/install -m 644 -o root -g wheel /dev/null ${caddy_logfile} + fi } caddy_start() { - echo -n "Starting caddy... " - /usr/bin/su -m ${caddy_user} -c "${command} start ${caddy_flags} \ - ${caddy_extra_flags} --pidfile ${pidfile}" >> ${caddy_logfile} 2>&1 - if [ $? -eq 0 ] && ps -ax -o pid | grep -q "$(cat ${pidfile})"; then - echo "done" - echo "Log: ${caddy_logfile}" - else - echo "Error: Caddy failed to start" - echo "Check the caddy log: ${caddy_logfile}" - fi + echo -n "Starting caddy... " + /usr/bin/su -m ${caddy_user} -c "${command} start ${caddy_flags} \ + ${caddy_extra_flags} --pidfile ${pidfile}" >> ${caddy_logfile} 2>&1 + if [ $? -eq 0 ] && ps -ax -o pid | grep -q "$(cat ${pidfile})"; then + echo "done" + echo "Log: ${caddy_logfile}" + else + echo "Error: Caddy failed to start" + echo "Check the caddy log: ${caddy_logfile}" + fi } -caddy_stop() +caddy_prestop() { - echo -n "Stopping caddy... " - if caddy_command stop; then - echo "done" - else - echo "Error: Unable to stop caddy" - echo "Check the caddy log: ${caddy_logfile}" - fi + local result + + echo -n "Stopping caddy... " + + result="$(caddy_command stop 2>&1)" + if [ ${?} -eq 0 ]; then + echo "done" + exit 0 + else + if echo "${result}" | grep -q "connection refused"; then + echo "admin interface unavailable; using pidfile" + return 0 + else + echo "Error: Unable to stop caddy" + echo "Check the caddy log: ${caddy_logfile}" + return 1 + fi + fi } run_rc_command "$1" diff --git a/www/caddy/pkg-descr b/www/caddy/pkg-descr index cd103498c0c0..2f30c17cc07e 100644 --- a/www/caddy/pkg-descr +++ b/www/caddy/pkg-descr @@ -11,5 +11,5 @@ Features: - ACME (Let's Encrypt) for public sites - Fully-managed local CA for internal names and IPs - Can coordinate with other Caddy instances in a cluster -- HTTP/1.1, HTTP/2, and experimental HTTP/3 support +- HTTP/1.1, HTTP/2, and HTTP/3 support - Actually fun to use
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209202050.28KKoq4C019386>