uptime-kuma: fix initd, split openrc package

diff --git a/testing/uptime-kuma/APKBUILD b/testing/uptime-kuma/APKBUILD
index 3b7acc6f1e8506e339711030ad3786bcd52c3c59..26c2385bba9b30309ed8b594a0aec56b45558d06 100644 (file)
--- a/testing/uptime-kuma/APKBUILD
+++ b/testing/uptime-kuma/APKBUILD
@@ -2,15 +2,16 @@
 # Maintainer: sev <alpine@sev.monster>
 pkgname=uptime-kuma
 pkgver=1.16.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A fancy self-hosted monitoring tool"
 url="https://uptime.kuma.pet"
 arch="x86_64"
 license="MIT"
-depends="nodejs>=14 py3-apprise"
+depends="py3-apprise"
+depends_openrc="nodejs>=14"
 makedepends="npm git"
 install="$pkgname.post-install"
-subpackages="$pkgname-openrc"
+subpackages="$pkgname-openrc:openrc"
 source="https://github.com/louislam/$pkgname/archive/$pkgver/$pkgname-$pkgver.tar.gz
         $pkgname.initd
         $pkgname.confd"
@@ -37,11 +38,12 @@ package() {
        install -Dm755 src/util.js "$sharedir"/src
        install -Dm755 extra/remove-2fa.js extra/reset-password.js \
                       extra/healthcheck.js "$sharedir"/extra
+}
+openrc() {
+       pkgdesc="NodeJS server for $pkgname"
        install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
        install -Dm755 "$srcdir/$pkgname.confd" "$pkgdir/etc/conf.d/$pkgname"
 }
+
 sha512sums="
-1250cd3bb239ea1ef7fa04742a7372190d8155d28ccb0f2d0a0117e8fa47bcdfb4c365819926d3ff70b26696463eac9806e9d413f516194397131367de88ec80  uptime-kuma-1.16.1.tar.gz
-be29addd1a357dbff3e43cf37b873a41c1452a870292c54f52dd7ca236f1208a7130df8330dff7eb64b6e974d7903ea3609733dc154ccc4ea506176691271e1c  uptime-kuma.initd
-fa3e42204410cd5033e8291d0f88281cf0ad591026675b193f679f47bcd89216eb0cb53bf890c2a3e1e87cd55fb1e06b93bd1f4cdbd13700c6fcb2d65adb17b8  uptime-kuma.confd
 "

diff --git a/testing/uptime-kuma/uptime-kuma.initd b/testing/uptime-kuma/uptime-kuma.initd
index ad63c7d822ab7c54bafe9a6626ca5d300b32dfe3..69452425e368bc8931dc14fdc31e73ea42e0d0ae 100644 (file)
--- a/testing/uptime-kuma/uptime-kuma.initd
+++ b/testing/uptime-kuma/uptime-kuma.initd
@@ -5,7 +5,7 @@ description="A free and open source uptime monitoring solution"
 
 : ${DATA_DIR:=/var/lib/$name/}
 export DATA_DIR UPTIME_KUMA_HOST UPTIME_KUMA_PORT UPTIME_KUMA_SSL_KEY \
-       UPTIME_KUMA_SSL_CERT \ UPTIME_KUMA_CLOUDFLARED_TOKEN \
+       UPTIME_KUMA_SSL_CERT UPTIME_KUMA_CLOUDFLARED_TOKEN \
        UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN NODE_EXTRA_CA_CERTS \
        NODE_TLS_REJECT_UNAUTHORIZED NODE_OPTIONS
 
@@ -13,7 +13,7 @@ directory="/usr/share/$RC_SVCNAME"
 : ${pidfile:="/run/$RC_SVCNAME.pid"}
 command="/usr/bin/node"
 command_args="server/server.js $command_args"
-: ${command_user:="$RC_SVCNAME:$RC_SVCNAME"}
+: ${command_user:="$name:$name"}
 command_background="yes"
 output_log="/var/log/$RC_SVCNAME.log"
 error_log="$output_log"