Removed 'netdata' folder in service files
pavel committed
Apr 9, 2016 at 06:37 UTC
7c0958c614591ce69490af74f9f530d71805dc85
2 files changed
+3
-9
system/netdata-openrc.in
+1
-6
@@ -22,7 +22,7 @@
22
: ${NETDATA_START_AFTER_SERVICES:=apache2 squid nginx mysql named opensips upsd hostapd postfix lm_sensors}
23
24
extra_started_commands="getconf"
25
-pidfile="/run/netdata/netdata.pid"
25
+pidfile="/run/netdata.pid"
26
command="${NETDATA_INSTALL_PATH}/usr/sbin/netdata"
27
command_background="yes"
28
command_args="-pidfile ${pidfile} ${NETDATA_EXTRA_ARGS}"
@@ -36,11 +36,6 @@ depend() {
36
checkpath -o ${NETDATA_OWNER} -d @localstatedir_POST@/cache/netdata /run/netdata
37
}
38
39
-start_pre() {
40
- piddir=$(dirname ${pidfile})
41
- mkdir -p ${piddir}
42
-}
43
-
39
start_post() {
40
if [[ ! -f @sysconfdir_POST@/netdata/netdata.conf ]]; then
41
ebegin "Downloading default configuration to @sysconfdir_POST@/netdata/netdata.conf"
system/netdata.service.in
+2
-3
@@ -7,9 +7,8 @@ Type=forking
7
WorkingDirectory=/tmp
8
User=root
9
Group=root
10
-PIDFile=@localstatedir_POST@/run/netdata/netdata.pid
11
-ExecStartPre=/usr/bin/mkdir -p @localstatedir_POST@/run/netdata
12
-ExecStart=@sbindir_POST@/netdata -pidfile @localstatedir_POST@/run/netdata/netdata.pid
10
+PIDFile=@localstatedir_POST@/run/netdata.pid
11
+ExecStart=@sbindir_POST@/netdata -pidfile @localstatedir_POST@/run/netdata.pid
12
ExecStop=/bin/kill -SIGTERM $MAINPID
13
TimeoutStopSec=30
14