diff options
| author | Lennart Weller <lhw@ring0.de> | 2016-05-25 13:56:12 +0000 |
|---|---|---|
| committer | Lennart Weller <lhw@ring0.de> | 2016-05-25 13:56:12 +0000 |
| commit | 59aa47927bf758f3c43009c0e0c403817e70e23c (patch) | |
| tree | c8755b89dfb3b7da7321202161a4e6b55131f8ee | |
| parent | wrong path for css and fonts (diff) | |
| parent | Move systemd service to simple (diff) | |
| download | netdata-59aa47927bf758f3c43009c0e0c403817e70e23c.tar.xz netdata-59aa47927bf758f3c43009c0e0c403817e70e23c.zip | |
Merge branch 'master' of ssh://git.debian.org/srv/git.debian.org/git/collab-maint/netdata
| -rw-r--r-- | debian/netdata.postrm | 2 | ||||
| -rw-r--r-- | debian/netdata.service | 15 |
2 files changed, 6 insertions, 11 deletions
diff --git a/debian/netdata.postrm b/debian/netdata.postrm index 1e4677f8..d45bb0ad 100644 --- a/debian/netdata.postrm +++ b/debian/netdata.postrm @@ -7,7 +7,7 @@ case "$1" in ;; purge) - for dir_name in /var/cache/netdata /var/lib/netdata /var/lib/netdata/www; do + for dir_name in /var/cache/netdata /var/lib/netdata /usr/share/netdata/web; do if dpkg-statoverride --list | grep -qw "$dir_name"; then dpkg-statoverride --remove "$dir_name" fi diff --git a/debian/netdata.service b/debian/netdata.service index 59ca5754..c4f30e0b 100644 --- a/debian/netdata.service +++ b/debian/netdata.service @@ -10,27 +10,22 @@ Wants=network-online.target ConditionPathExists=/etc/netdata/netdata.conf [Service] -Type=forking -#PIDFile=/run/netdata.pid -PIDFile=/var/run/netdata/netdata.pid +Type=simple Environment="netdata_LOG_LOCATION=/var/log/netdata/log" -ExecStart=/usr/sbin/netdata +ExecStart=/usr/sbin/netdata -nd ExecReload=/usr/sbin/netdata reload -#ExecStop=/bin/kill -SIGTERM $MAINPID -ExecStop=-/sbin/start-stop-daemon --quiet --stop --retry=TERM/5/KILL/5 --pidfile /run/netdata.pid -TimeoutStopSec=30 +TimeoutStopSec=10 KillMode=mixed +KillSignal=SIGTERM -EnvironmentFile=-/etc/default/%p User=netdata +Group=netdata PermissionsStartOnly=true Restart=on-abnormal RestartSec=2s LimitNOFILE=65536 WorkingDirectory=/tmp -User=root -Group=root # Hardening # AppArmorProfile=system_netdata |