gentoo resync : 28.04.2021

2 files changed, 5 insertions, 25 deletions

diff --git a/app-metrics/node_exporter/files/node_exporter-1.initd b/app-metrics/node_exporter/files/node_exporter-1.initd
deleted file mode 100644
index 083cba9cddd4..000000000000
--- a/app-metrics/node_exporter/files/node_exporter-1.initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prometheus machine metrics exporter"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/bin/node_exporter"
-command_args="${command_args:---collector.textfile.directory=/var/lib/node_exporter/}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/node_exporter/${RC_SVCNAME}.log \
-	--stderr /var/log/node_exporter/${RC_SVCNAME}.log"
-
-depend() {
-	after net
-}
-
-start_pre() {
-	checkpath -q -d -m 0755 -o ${user}:${group} /var/log/node_exporter
-}
diff --git a/app-metrics/node_exporter/files/node_exporter.service b/app-metrics/node_exporter/files/node_exporter.service
index 3235924f7850..20eac483fc8a 100644
--- a/app-metrics/node_exporter/files/node_exporter.service
+++ b/app-metrics/node_exporter/files/node_exporter.service
@@ -1,10 +1,13 @@
 [Unit]
 Description=Node Exporter
+Wants=network-online.target
+After=network-online.target
 
 [Service]
 User=node_exporter
-EnvironmentFile=/etc/sysconfig/node_exporter
-ExecStart=/usr/bin/node_exporter $OPTIONS
+Group=node_exporter
+Type=simple
+ExecStart=/usr/sbin/node_exporter
 
 [Install]
 WantedBy=multi-user.target