Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www-servers/caddy/Manifest6
-rw-r--r--www-servers/caddy/caddy-2.7.4-r1.ebuild86
-rw-r--r--www-servers/caddy/caddy-2.7.4.ebuild45
-rw-r--r--www-servers/caddy/caddy-2.7.5.ebuild98
-rw-r--r--www-servers/caddy/files/caddy.service17
-rw-r--r--www-servers/caddy/files/caddy_config.json31
-rw-r--r--www-servers/caddy/files/confd2
-rw-r--r--www-servers/caddy/files/initd26
8 files changed, 0 insertions, 311 deletions
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index da79d9aa35ce..4c5c94fe3f66 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -1,9 +1,3 @@
-DIST caddy-2.7.4-deps.tar.xz 146920768 BLAKE2B 25d99c7d73f7c9a63868ab496f27571d15181cee298e16a83c02b652b8b89cab615969897d11faadfdc3e9ca389783c3b610e219a16b0a146748d0ea2e3309ca SHA512 5cdb95bcf7435a76385d0fc9277bdaa317261698f1bf15b54e081b89bd971927c0f5ca9f42a693127fabca9c6a6eae81978c6b4978ff9962f67a83591d104e6a
-DIST caddy-2.7.4-docs.tar.gz 25264 BLAKE2B 2282ac0ddd76b0837d33cf24d01f13ac9c0c8e0abf043cf5ade0ec3a51fda2d7c15589574b159df00e2c25733f10ccc6f4cf6b3a97f9f831aa276f3adee84fd9 SHA512 179a13b89b0da1771dcaf798e33000b60f202804e728d8aca85a23a68b055ee6d12e5f75eb30257a412621ffd105035bd371bd7e448f876eeb91544fd3092344
-DIST caddy-2.7.4.tar.gz 625647 BLAKE2B be4749a2298d2e00e2a24324ee31090847be9ec4de49f47715c86e65750d01698b5a4a21990430cc7622fecce5b375ae8e3fb2ef832515ce9dcca8f2d26a9911 SHA512 e988ec4fa526d16b91a86f28fc13c606ab159815d5be45a2ea65bf91b5579a25efc8ff415b0aa98699f72bd3106ed02d49e48303d9c80e7fe6805ade416e7dff
-DIST caddy-2.7.5-deps.tar.xz 161234532 BLAKE2B 130e3fd75d7d2976ef27c2afe0cede8da957ad1c8db7b2140ef69a732cf25c6a04bde43c836832a0f7c14dbb4ab9cd48b496b8ea644da411181ba79b4116d892 SHA512 3dcc834e8cc9851f114d173a812de4b3a5256f8458f2d20ed0c66109d1ede1ee8e1d85053347a194818495cdfcaab2bf86d1b12f94fe2f917e22bf25b8d9c411
-DIST caddy-2.7.5-docs.tar.gz 24578 BLAKE2B e08bfa37b157d8d4300198384bfc4c19cb0f539cc293311eaedcddffd4469026605c92f4388202db68beeadb2353666860daf3845ff5d69bb11afdb29eefe02b SHA512 635fdc1f2767cceacbddbbf56ba7207d558475c66ff9434a2b6edffd59d3711be0c6a4b4ffd2a6cf2eee53dcf22097c2b11eb44f0e9cc1d8455c1ea7c01bc498
-DIST caddy-2.7.5.tar.gz 611282 BLAKE2B 86c28922f80f931452e81b0c3fa52ed0b86b2325eb2a1adf1de830a7a339772063955fd3cb5ee888cbf8c1c905b98bb6a292b592a2983012ad4fefe33c361e82 SHA512 45f6790b7c3683a8001445e932d5678fd27d204500f7301d92c4d8421f24574e113bf7c335bd277b16abe07eb3d24258358f87c68cee38905fa6d0e6bcc1c24c
DIST caddy-2.7.6-deps.tar.xz 128958740 BLAKE2B ffbe682df64a88dac9f50e9712f1d6697e58f2d9854c270321f7a0325f0b5ead7f93316756136a4435b70c5e08742c7130ce507ee4aa4696f4fb906f4eba8754 SHA512 f467144e235e09a7718cffe5ed3c40ec2d63038a6a948fe4f85d34717877af8a9959ef7e2c3ac32fd0cce522d693ccac883877f061f5cefc9512f7eed556b336
DIST caddy-2.7.6-docs.tar.gz 24583 BLAKE2B d3dbbb701d86cbfaf538f10911fdd3613b8c3c0f49ef9e229487d2a4fcef9eff79b56e9852d5c1ccd5a8d1d1898861fc8183c343c129901562b03a9092af9e61 SHA512 62e534d41e714b47265fd8089ad9e03a1a89903460976d8af27fa5f71173e076bab8574282213595e495be701b769e1a70ff9e7ec9576fbf8e821e672207faa5
DIST caddy-2.7.6-r1-deps.tar.xz 129331604 BLAKE2B 50b83c012c70637936c83ec765758cdcd80014ca224d76a746de8640a6b36ae15ce11ec57d9fdb20a5f7b3add946209c6dde7bb4e4bd4a47ffe3ffc8971725db SHA512 a4bc56de4f7ec8e9967dde3d7ca4cbb74cba9ce0b8906ffe16f8dae3f52fff1164827942df8154eadbae80cce3ee603535b9135cf8a5126d84a9017e8aece078
diff --git a/www-servers/caddy/caddy-2.7.4-r1.ebuild b/www-servers/caddy/caddy-2.7.4-r1.ebuild
deleted file mode 100644
index e60c54e02eb3..000000000000
--- a/www-servers/caddy/caddy-2.7.4-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module systemd shell-completion
-
-DESCRIPTION="Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS"
-HOMEPAGE="https://caddyserver.com"
-
-if [[ "${PV}" == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/caddyserver/caddy.git"
-else
- SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
- SRC_URI+=" https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz -> ${P}-docs.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
-fi
-
-LICENSE="Apache-2.0 BSD ECL-2.0 MIT CC0-1.0"
-SLOT="0"
-RESTRICT="test"
-RDEPEND="
- acct-user/http
- acct-group/http"
-DEPEND="${RDEPEND}"
-
-FILECAPS=(
- -m 755 'cap_net_bind_service=+ep' usr/bin/"${PN}"
-)
-
-src_unpack() {
- if [[ "${PV}" == *9999* ]]; then
- # unpack code
- git-r3_src_unpack
-
- # unpack docs and misc
- EGIT_REPO_URI="https://github.com/caddyserver/dist.git"
- EGIT_CHECKOUT_DIR="${WORKDIR}/dist-${PV}"
- git-r3_src_unpack
-
- go-module_live_vendor
- else
- go-module_src_unpack
- fi
-}
-
-src_prepare(){
- default
- sed -i -e "s|User=caddy|User=http|g;" ../dist-"${PV}"/init/*service || die
- sed -i -e "s|Group=caddy|Group=http|g;" ../dist-"${PV}"/init/*service || die
-}
-
-src_compile() {
- ego build ./cmd/caddy
- for sh in bash fish zsh; do
- ./caddy completion "${sh}" > completion."${sh}" || die
- done
- ./caddy manpage -o manpages || die
-}
-
-src_install() {
- default
-
- dobin "${PN}"
- insinto /etc/"${PN}"
- newins ../dist-"${PV}"/config/Caddyfile Caddyfile.example
- systemd_dounit ../dist-"${PV}"/init/*.service
- newinitd "${FILESDIR}/initd" "${PN}"
- newconfd "${FILESDIR}/confd" "${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/logrotated" "${PN}"
- insinto /usr/share/"${PN}"
- doins ../dist-"${PV}"/welcome/index.html
-
- newbashcomp completion.bash "${PN}"
- newfishcomp completion.fish "${PN}".fish
- newzshcomp completion.zsh _"${PN}"
- newdoc ../dist-"${PV}"/init/README.md systemd-services-README.md
- doman manpages/*
-}
-
-pkg_postinst() {
- fcaps_pkg_postinst
-}
diff --git a/www-servers/caddy/caddy-2.7.4.ebuild b/www-servers/caddy/caddy-2.7.4.ebuild
deleted file mode 100644
index 83a56917b23a..000000000000
--- a/www-servers/caddy/caddy-2.7.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit fcaps go-module systemd
-
-DESCRIPTION="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
-HOMEPAGE="https://caddyserver.com"
-SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD ECL-2.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-RDEPEND="
- acct-user/http
- acct-group/http"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-FILECAPS=(
- -m 755 'cap_net_bind_service=+ep' usr/bin/${PN}
-)
-
-src_compile() {
- ego build ./cmd/caddy
-}
-
-src_install() {
- dobin caddy
- dodoc README.md
- keepdir /etc/caddy
- insinto /etc/caddy
- newins "${FILESDIR}"/caddy_config.json caddy_config.json.example
- systemd_dounit "${FILESDIR}/${PN}.service"
- newinitd "${FILESDIR}/initd" "${PN}"
- newconfd "${FILESDIR}/confd" "${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/logrotated" "${PN}"
-}
-
-pkg_postinst() {
- fcaps_pkg_postinst
-}
diff --git a/www-servers/caddy/caddy-2.7.5.ebuild b/www-servers/caddy/caddy-2.7.5.ebuild
deleted file mode 100644
index 94e80cc06f04..000000000000
--- a/www-servers/caddy/caddy-2.7.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module systemd shell-completion
-
-DESCRIPTION="Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS"
-HOMEPAGE="https://caddyserver.com"
-
-if [[ "${PV}" == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/caddyserver/caddy.git"
-else
- SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
- SRC_URI+=" https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz -> ${P}-docs.tar.gz"
- KEYWORDS="amd64 ~arm64 ~loong ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-LICENSE+=" BSD ECL-2.0 MIT CC0-1.0"
-SLOT="0"
-RESTRICT="test"
-RDEPEND="
- acct-user/http
- acct-group/http"
-DEPEND="${RDEPEND}"
-
-FILECAPS=(
- -m 755 'cap_net_bind_service=+ep' usr/bin/"${PN}"
-)
-
-PATCHES=(
- "${FILESDIR}"/remove-binary-altering-commands-2.7.5.patch
-)
-
-src_unpack() {
- if [[ "${PV}" == *9999* ]]; then
- # unpack code
- git-r3_src_unpack
-
- # unpack docs and misc
- EGIT_REPO_URI="https://github.com/caddyserver/dist.git"
- EGIT_CHECKOUT_DIR="${WORKDIR}/dist-${PV}"
- git-r3_src_unpack
-
- go-module_live_vendor
- else
- go-module_src_unpack
- fi
-}
-
-src_prepare(){
- default
- sed -i -e "s|User=caddy|User=http|g;s|Group=caddy|Group=http|g;" ../dist-"${PV}"/init/*service || die
-}
-
-src_compile() {
- # https://github.com/caddyserver/caddy/blob/master/caddy.go#L843
- if [[ ${PV} == 9999* ]]; then
- local CUSTOM_VER="git-$(git rev-parse --short HEAD)"
- else
- local CUSTOM_VER="${PV}"
- fi
-
- ego build -ldflags "-X github.com/caddyserver/caddy/v2.CustomVersion=${CUSTOM_VER}" ./cmd/caddy
- local sh
- for sh in bash fish zsh; do
- ./caddy completion "${sh}" > completion."${sh}" || die
- done
- ./caddy manpage -o manpages || die
-}
-
-src_install() {
- default
-
- dobin "${PN}"
- insinto /etc/"${PN}"
- doins ../dist-"${PV}"/config/Caddyfile
- systemd_dounit ../dist-"${PV}"/init/*.service
- newinitd "${FILESDIR}"/initd-2.7.5 "${PN}"
- newconfd "${FILESDIR}"/confd-2.7.5 "${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/logrotated" "${PN}"
- insinto /usr/share/"${PN}"
- doins ../dist-"${PV}"/welcome/index.html
-
- newbashcomp completion.bash "${PN}"
- newfishcomp completion.fish "${PN}".fish
- newzshcomp completion.zsh _"${PN}"
- newdoc ../dist-"${PV}"/init/README.md systemd-services-README.md
- doman manpages/*
-}
-
-pkg_postinst() {
- fcaps_pkg_postinst
-}
diff --git a/www-servers/caddy/files/caddy.service b/www-servers/caddy/files/caddy.service
deleted file mode 100644
index b11d0827ef83..000000000000
--- a/www-servers/caddy/files/caddy.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Caddy web server
-After=network.target
-
-[Service]
-Type=simple
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-NoNewPrivileges=true
-User=http
-Environment=CADDY_OPTS="run --config /etc/caddy/caddy_config.json"
-Restart=on-failure
-RestartSec=5s
-ExecStart=/usr/bin/caddy $CADDY_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/www-servers/caddy/files/caddy_config.json b/www-servers/caddy/files/caddy_config.json
deleted file mode 100644
index 80918a3254fa..000000000000
--- a/www-servers/caddy/files/caddy_config.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "admin": {
- "disabled": true
- },
- "apps": {
- "http": {
- "servers": {
- "static": {
- "idle_timeout": 30000000000,
- "listen": [
- ":80"
- ],
- "logs": {},
- "max_header_bytes": 10240,
- "read_header_timeout": 10000000000,
- "routes": [
- {
- "handle": [
- {
- "browse": {},
- "handler": "file_server",
- "root": "/var/www/localhost/htdocs"
- }
- ]
- }
- ]
- }
- }
- }
- }
-}
diff --git a/www-servers/caddy/files/confd b/www-servers/caddy/files/confd
deleted file mode 100644
index 39e8468ed962..000000000000
--- a/www-servers/caddy/files/confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# command_user="http:http"
-# command_args="run --config /etc/caddy/caddy_config.json"
diff --git a/www-servers/caddy/files/initd b/www-servers/caddy/files/initd
deleted file mode 100644
index 3f080d202e1e..000000000000
--- a/www-servers/caddy/files/initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-
-description="Caddy web server"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-command="/usr/bin/caddy"
-command_user="${command_user:-"http:http"}"
-command_args="${command_args:-"run --config /etc/caddy/caddy_config.json"}"
-command_background="true"
-logfile=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
-start_stop_daemon_args="--user ${command_user%:*} --group ${command_user#*:}
- --stdout ${logfile} --stderr ${logfile}"
-
-: "${supervisor:=supervise-daemon}"
-: "${respawn_delay:=5}"
-: "${respawn_max:=10}"
-: "${respawn_period:=60}"
-
-depend() {
- need net
-}
-
-start() {
- checkpath --directory --mode 755 --owner root "${pidfile%/*}"
- checkpath --directory --mode 755 --owner "${command_user}" "${logfile%/*}"
- default_start
-}