commit ba20f0e4f7dfca8743c96bd0f4dc6c791dd8c4fe parent 0a1fcfcb72685f0eaefb638ddd3783e1211c1541 Author: Hannu Nyman <hannu.nyman@iki.fi> Date: Wed, 28 Sep 2016 09:13:21 +0300 Merge pull request #3246 from diizzyy/patch-7 netdata: update to 1.3.0 and use procd init Diffstat:
| M | admin/netdata/Makefile | | | 9 | ++++----- |
| M | admin/netdata/files/netdata.init | | | 22 | ++++++++++++++++------ |
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/admin/netdata/Makefile b/admin/netdata/Makefile @@ -8,16 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netdata -PKG_VERSION:=1.2.0 +PKG_VERSION:=1.3.0 PKG_RELEASE:=1 PKG_MAINTAINER:=Sebastian Careba <nitroshift@yahoo.com> PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILES:=COPYING -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/firehol/netdata -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=bb4aa949f5ac825253d8adc6070661299abc1c3b +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://firehol.org/download/netdata/releases/v$(PKG_VERSION) +PKG_SOURCE_VERSION:=f8ed1eac764386b839fbd2db0f41e664 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_INSTALL:=1 diff --git a/admin/netdata/files/netdata.init b/admin/netdata/files/netdata.init @@ -1,11 +1,21 @@ #!/bin/sh /etc/rc.common START=99 +USE_PROCD=1 -start() { - service_start /usr/sbin/netdata -} +APPBINARY=/usr/sbin/netdata +CONFIGFILE=/etc/netdata/netdata.conf -stop() { - service_stop /usr/sbin/netdata -} + start_service() { + mkdir -m 0755 -p /var/cache/netdata + chown nobody /var/cache/netdata + mkdir -m 0755 -p /var/lib/netdata + chown nobody /var/lib/netdata + mkdir -m 0755 -p /var/log/netdata + chown nobody /var/log/netdata + procd_open_instance + procd_set_param command $APPBINARY -nd -c $CONFIGFILE + procd_set_param file $CONFIGFILE + procd_set_param respawn + procd_close_instance + }