4 files changed, 20 insertions(+), 18 deletions(-)

M sr.ht/prometheus-node-exporter/APKBUILD
A sr.ht/prometheus-node-exporter/prometheus-node-exporter.confd
M sr.ht/prometheus-node-exporter/prometheus-node-exporter.initd
A sr.ht/prometheus-node-exporter/prometheus-node-exporter.pre-install

@@ 1,15 1,17 @@
 # Maintainer: Drew DeVault <sir@cmpwn.com>
 pkgname=prometheus-node-exporter
 pkgver=0.18.1
-pkgrel=0
+pkgrel=1
 pkgdesc="prometheus exporter for machine metrics"
 url="https://github.com/prometheus/node_exporter"
 arch="all"
 license="Apache-2.0"
+install="prometheus-node-exporter.pre-install"
 makedepends="go"
 source="
 	$pkgname-$pkgver.tar.gz::https://github.com/prometheus/node_exporter/archive/v$pkgver.tar.gz
 	prometheus-node-exporter.initd
+	prometheus-node-exporter.confd
 "
 subpackages="$pkgname-openrc"
 builddir="$srcdir/node_exporter-$pkgver"

@@ 0,0 1,4 @@
+prometheus_node_exporter_web_listen_address=127.0.0.1:9100
+
+output_log=/var/log/prometheus-node-exporter.log
+error_log=/var/log/prometheus-node-exporter.log

@@ 1,21 1,13 @@
 #!/sbin/openrc-run
 name="prometheus-node-exporter"
-description="prometheus node exporter"
+description="Prometheus node monitoring daemon"
+supervisor=supervise-daemon
+command=/usr/bin/prometheus_node_exporter
+command_args="--web.listen-address=$prometheus_node_exporter_web_listen_address"
 
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting $name"
-	start-stop-daemon -C --background --make-pidfile --pidfile /run/$name.pid \
-		--exec /usr/bin/prometheus_node_exporter -- \
-		--web.listen-address=127.0.0.1:9100
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping $name"
-	start-stop-daemon --stop --exec /usr/bin/prometheus-node-exporter --pidfile /run/$name.pid
-	eend $?
+start_pre() {
+	[ -n "$output_log" ] && checkpath -f "$output_path" \
+		-m 644 -o prometheus:prometheus
+	[ -n "$error_log" ] && checkpath -f "$error_path" \
+		-m 644 -o prometheus:prometheus
 }

@@ 0,0 1,4 @@
+#!/bin/sh
+grep '^prometheus:' /etc/group >/dev/null || addgroup -S prometheus 2>/dev/null
+grep '^prometheus:' /etc/passwd >/dev/null || adduser -SDh/var/lib/prometheus \
+	-s/sbin/nologin -Gprometheus -gprometheus prometheus prometheus 2>/dev/null