summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorFederico Ceratto <federico.ceratto@gmail.com>2017-12-19 23:39:21 +0000
committerFederico Ceratto <federico.ceratto@gmail.com>2017-12-19 23:39:21 +0000
commit61aedf201c2c4bf0e5aa4db32e74f4d860b88593 (patch)
treebcf4f9a0cd8bc2daf38b2ff9f29bfcc1e5ed8968 /system
parentNew upstream version 1.8.0+dfsg (diff)
downloadnetdata-61aedf201c2c4bf0e5aa4db32e74f4d860b88593.tar.xz
netdata-61aedf201c2c4bf0e5aa4db32e74f4d860b88593.zip
New upstream version 1.9.0+dfsgupstream/1.9.0+dfsg
Diffstat (limited to 'system')
-rw-r--r--system/netdata-openrc.in16
-rw-r--r--system/netdata.service.in3
2 files changed, 11 insertions, 8 deletions
diff --git a/system/netdata-openrc.in b/system/netdata-openrc.in
index 465e1232c..ce76f7e64 100644
--- a/system/netdata-openrc.in
+++ b/system/netdata-openrc.in
@@ -23,7 +23,7 @@
extra_started_commands="getconf"
pidfile="/run/netdata.pid"
-command="${NETDATA_INSTALL_PATH}/usr/sbin/netdata"
+command="@sbindir_POST@/netdata"
command_background="yes"
command_args="-P ${pidfile} ${NETDATA_EXTRA_ARGS}"
# start_stop_daemon_args="-u ${NETDATA_OWNER}"
@@ -38,13 +38,13 @@ depend() {
}
start_post() {
- if [[ ! -f @sysconfdir_POST@/netdata/netdata.conf ]]; then
+ if [ ! -f @sysconfdir_POST@/netdata/netdata.conf ]; then
ebegin "Downloading default configuration to @sysconfdir_POST@/netdata/netdata.conf"
sleep 2
curl -s -o @sysconfdir_POST@/netdata/netdata.conf.new "${NETDATA_CONFIG_URL}"
ret=$?
- if [[ $ret -eq 0 && -s @sysconfdir_POST@/netdata/netdata.conf.new ]]; then
- mv @sysconfdir_POST@/netdata/netdata.conf{.new,}
+ if [ $ret -eq 0 && -s @sysconfdir_POST@/netdata/netdata.conf.new ]; then
+ mv @sysconfdir_POST@/netdata/netdata.conf.new @sysconfdir_POST@/netdata/netdata.conf
else
ret=1
rm @sysconfdir_POST@/netdata/netdata.conf.new 2>/dev/null
@@ -57,20 +57,20 @@ stop_post() {
local result ret=0 count=0 sigkill=0
ebegin "Waiting for netdata to save its database"
- while [[ -f "${pidfile}" ]]; do
- if [[ $count -gt ${NETDATA_WAIT_EXIT_TIMEOUT} ]]; then
+ while [ -f "${pidfile}" ]; do
+ if [ $count -gt ${NETDATA_WAIT_EXIT_TIMEOUT} ]; then
sigkill=1
break
fi
- count=$[count + 1]
+ count=$((count + 1))
kill -0 $(cat ${pidfile}) 2>/dev/null
ret=$?
test $ret -eq 0 && sleep 1
done
eend $sigkill
- if [[ $sigkill -eq 1 && -f "${pidfile}" ]]; then
+ if [ $sigkill -eq 1 -a -f "${pidfile}" ]; then
ebegin "Netdata is taking too long to exit, forcing it to quit"
kill -SIGKILL $(cat ${pidfile}) 2>/dev/null
eend $?
diff --git a/system/netdata.service.in b/system/netdata.service.in
index 1d4af988a..58cdff225 100644
--- a/system/netdata.service.in
+++ b/system/netdata.service.in
@@ -9,6 +9,9 @@ Group=netdata
RuntimeDirectory=netdata
RuntimeDirectoryMode=0775
ExecStart=@sbindir_POST@/netdata -P /run/netdata/netdata.pid -D
+ExecStartPre=/bin/mkdir -p @localstatedir_POST@/cache/netdata
+ExecStartPre=/bin/chown -R netdata:netdata @localstatedir_POST@/cache/netdata
+PermissionsStartOnly=true
# saving a big db on slow disks may need some time
TimeoutStopSec=60