diff options
| -rw-r--r-- | community/caddy/APKBUILD | 8 | ||||
| -rw-r--r-- | community/caddy/caddy.confd | 1 | ||||
| -rw-r--r-- | community/caddy/caddy.initd | 11 |
3 files changed, 8 insertions, 12 deletions
diff --git a/community/caddy/APKBUILD b/community/caddy/APKBUILD index 96e746e2f3..ba79d46526 100644 --- a/community/caddy/APKBUILD +++ b/community/caddy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Chloe Kudryavtsev <toast@toastin.space> pkgname=caddy pkgver=1.0.4 -pkgrel=0 +pkgrel=1 pkgdesc="Fast, cross-platform HTTP/2 web server with automatic HTTPS" url="https://caddyserver.com/" arch="all !s390x" @@ -19,7 +19,7 @@ subpackages="$pkgname-openrc" install="$pkgname.pre-install" pkgusers="$pkgname" pkggroups="$pkgname" -source="$pkgname-$pkgver.tar.gz::https://github.com/caddyserver/$pkgname/archive/v$pkgver.tar.gz +source="$pkgname-$pkgver.tar.gz::https://github.com/caddyserver/caddy/archive/v$pkgver.tar.gz $pkgname.initd $pkgname.confd $pkgname.conf @@ -72,6 +72,6 @@ cleanup_srcdir() { } sha512sums="49dae9c0965000ba1cf36a6148ff78718383a511d671fb73edc3b08e4219db0a9902fc70e40bcbb13ffa7afaa520fd1e6303ea3776059de04085896c018d9c02 caddy-1.0.4.tar.gz -191b57cee5ebf8cad87bfaefdafc55008ae947f366f7288c4ae712bd026899ed8014949ae3f2860d2e6dc85781ca95b0e7c5fb2c02e67b9b4619abfe87bda55e caddy.initd -7808688e92ab9950403a9b8ad29777f5bd0f75aa8cccc1d49958bb1e5af1b972dfba0c6d31931354f702a3a13933d0a1b8f28b82eed263773d71b79ec95cc15c caddy.confd +1fbab66fbc913f194a94eee6e60e218fcc762b9467258ff22eed43dc98664692f2f2525226068fe3ca101cfe5b6727f16774c2a49c575abb83782416680f399a caddy.initd +4b0e11f6780b3a39d0e0294f5bddc57f1b9cfd585cfa99c864fc97798b506c8e7cf486e1bb0ef70d8e02a3e693d140c85e12da2cf79014f797518b28d2391120 caddy.confd c24805d17234e6cf40fe1dd102c03f05cf6129d43f58f5567d540a0e4400ce89994820bb0e317f611c65459ae26bcf7110e23a8fecaae11ca78a561892b45d75 caddy.conf" diff --git a/community/caddy/caddy.confd b/community/caddy/caddy.confd index 1c17719c61..9236e833ea 100644 --- a/community/caddy/caddy.confd +++ b/community/caddy/caddy.confd @@ -1,2 +1,3 @@ # caddy options file CADDY_OPTS="-conf /etc/caddy/caddy.conf -agree" +CADDYPATH=/etc/caddy diff --git a/community/caddy/caddy.initd b/community/caddy/caddy.initd index 22d9fab90a..8e4dae22da 100644 --- a/community/caddy/caddy.initd +++ b/community/caddy/caddy.initd @@ -1,10 +1,9 @@ #!/sbin/openrc-run +supervisor=supervise-daemon name="Caddy webserver" -command="/usr/sbin/caddy" +command=/usr/sbin/caddy command_args="$CADDY_OPTS" -pidfile="/var/run/caddy.pid" -command_background=yes command_user=caddy:caddy extra_commands="checkconfig" extra_started_commands="reload" @@ -23,11 +22,7 @@ checkconfig() { reload() { checkconfig || return $? ebegin "Reloading $RC_SVCNAME" - case "$supervisor" in - "") start-stop-daemon --signal USR1 --pidfile "$pidfile";; - supervise-daemon) supervise-daemon $RC_SVCNAME --signal USR1;; - *) eend 1 "Unsupported supervisor: $supervisor";; - esac + supervise-daemon $RC_SVCNAME --signal USR1 eend $? } |