community/vnstat: improve init script, don't force supervise-daemon

3 files changed, 33 insertions, 20 deletions

diff --git a/community/vnstat/APKBUILD b/community/vnstat/APKBUILD
index fcebf807833..ee799453396 100644
--- a/community/vnstat/APKBUILD
+++ b/community/vnstat/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=vnstat
 pkgver=2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Console-based network traffic monitor"
 url="http://humdi.net/vnstat"
 arch="all"
@@ -41,5 +41,5 @@ check() {
 }
 
 sha512sums="1a62fc9c2379b050208945e85bad04f602a0f2c71e6bd069d241c1df77c76ec6258948fc3fdf633b15c52665782cae4f995a916103d330bfb46cab0291d3a1ea  vnstat-2.6.tar.gz
-b7372c7638a56ebe00642d871ff94589b6a5a402bff32f01383bdb87af01de55fd3dc88884693604bd154f28dad2ba503a2f761fd39576a0512538fc89ed4ddc  vnstatd.initd
-d645817913d5b52e928561b3d6a0e869d8ae5db81b97af91c1ebfc6a8cd2df666c1653e6dc5f91c0a890033a89692f77eaf081c1cae5590446c69a70ea263946  vnstatd.confd"
+f419af7075ba423fd2a28f27c520c9833a0ad994f471df5ab56b8175d02bf7d885718d2781a5538e32d19256e4518b06629a87670380db8a5cc780b76b4f0465  vnstatd.initd
+bde20cffcfe6e2f7f7924ad7e7b4c7c2fdd6b92bacb7ec7c670413354c3b5a0bb07321444c4bd8ff07b55cb861bf6442a7065eee856f74658be1f25a451c8109  vnstatd.confd"
diff --git a/community/vnstat/vnstatd.confd b/community/vnstat/vnstatd.confd
index 17901419aac..4f46fb3eeed 100644
--- a/community/vnstat/vnstatd.confd
+++ b/community/vnstat/vnstatd.confd
@@ -1,7 +1,13 @@
-# /etc/conf.d/vnstatd: config file for /etc/init.d/vnstatd
+# Configuration file for /etc/init.d/vnstatd
 
-# Adjust scheduling priority on vnstatd (default: 0)
-#VNSTATD_NICELEVEL="0"
+# Path to the vnstat config file.
+#cfgfile="/etc/vnstat.conf"
 
-# Pass extra options to vnstatd
-#VNSTATD_EXTRAOPTS="--config /etc/vnstat.conf"
+# Adjust scheduling priority on vnstatd (default is 0).
+#nicelevel=0
+
+# Pass extra options to vnstatd.
+#command_args=
+
+# Uncomment to use process supervisor.
+#supervisor="supervise-daemon"
diff --git a/community/vnstat/vnstatd.initd b/community/vnstat/vnstatd.initd
index 8a6e7ed91ac..5a829ba0172 100644
--- a/community/vnstat/vnstatd.initd
+++ b/community/vnstat/vnstatd.initd
@@ -1,19 +1,22 @@
 #!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-supervisor=supervise-daemon
 
-name=vnstat
+extra_started_commands="reload"
 description="Daemon based database updating for vnStat"
 
-command=/usr/sbin/vnstatd
-command_args="$VNSTATD_EXTRAOPTS"
-command_args_foreground="--nodaemon"
+: ${cfgfile:="/etc/vnstat.conf"}
+: ${command_user:="vnstat:vnstat"}
+# VNSTATD_NICELEVEL is here for backward compatibility only
+: ${nicelevel:=${VNSTATD_NICELEVEL:-0}}
 
-command_user=vnstat:vnstat
-supervise_daemon_args="--nicelevel  ${VNSTATD_NICELEVEL:-0}"
+command=/usr/sbin/vnstatd
+# $VNSTATD_EXTRAOPTS is here for backward compatibility only
+command_args="--nodaemon --config $cfgfile ${command_args:-$VNSTATD_EXTRAOPTS}"
+command_background="yes"
+pidfile="/run/$RC_SVCNAME.pid"
+start_stop_daemon_args="--nicelevel $nicelevel"
+supervise_daemon_args="$start_stop_daemon_args"
 
-extra_started_commands="reload"
+required_files="$cfgfile"
 
 depend() {
 	use net
@@ -24,7 +27,11 @@ start_pre() {
 }
 
 reload() {
-	ebegin "Reloading vnstatd configuration"
-	$supervisor $RC_SVCNAME --signal HUP
+	ebegin "Reloading $RC_SVCNAME configuration"
+	if [ "$supervisor" ]; then
+		$supervisor "$RC_SVCNAME" --signal HUP
+	else
+		start-stop-daemon --pidfile "$pidfile" --signal HUP
+	fi
 	eend $?
 }