summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikle Kolyada <zlogene@gentoo.org>2021-04-07 11:27:59 +0300
committerMikle Kolyada <zlogene@gentoo.org>2021-04-07 11:59:47 +0300
commit13ace9cf0a40ff74547390ee0976ada47bd1c2bf (patch)
tree31b9577e994365642387b5f8448b76da67394465
parentdev-libs/zlog: Add v1.2.15 (diff)
downloadgentoo-13ace9cf0a40ff74547390ee0976ada47bd1c2bf.tar.gz
gentoo-13ace9cf0a40ff74547390ee0976ada47bd1c2bf.tar.bz2
gentoo-13ace9cf0a40ff74547390ee0976ada47bd1c2bf.zip
app-metrics/node_exporter: fix broken systemd support
Closes: https://bugs.gentoo.org/679312 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
-rw-r--r--app-metrics/node_exporter/files/node_exporter.service7
-rw-r--r--app-metrics/node_exporter/node_exporter-1.1.2-r1.ebuild (renamed from app-metrics/node_exporter/node_exporter-1.1.2.ebuild)8
2 files changed, 8 insertions, 7 deletions
diff --git a/app-metrics/node_exporter/files/node_exporter.service b/app-metrics/node_exporter/files/node_exporter.service
index 3235924f785..20eac483fc8 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
diff --git a/app-metrics/node_exporter/node_exporter-1.1.2.ebuild b/app-metrics/node_exporter/node_exporter-1.1.2-r1.ebuild
index dc94a55d0c6..d3c63f4c958 100644
--- a/app-metrics/node_exporter/node_exporter-1.1.2.ebuild
+++ b/app-metrics/node_exporter/node_exporter-1.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -578,7 +578,7 @@ SRC_URI="https://github.com/prometheus/node_exporter/archive/${MY_PV}.tar.gz ->
LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
CDEPEND="acct-group/node_exporter
acct-user/node_exporter"
@@ -602,9 +602,7 @@ src_compile() {
src_install() {
dosbin node_exporter/node_exporter
dodoc {README,CHANGELOG,CONTRIBUTING}.md
- systemd_dounit examples/systemd/node_exporter.service
- insinto /etc/sysconfig
- newins examples/systemd/sysconfig.node_exporter node_exporter
+ systemd_dounit "${FILESDIR}"/node_exporter.service
newinitd "${FILESDIR}"/${PN}.initd ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
keepdir /var/lib/node_exporter /var/log/node_exporter