From 5980d319b65b78f1953a0864201cdaeac7e04cda Mon Sep 17 00:00:00 2001
From: Nicolas MASSE <nicolas.masse@itix.fr>
Date: Tue, 30 Mar 2021 10:47:37 +0200
Subject: [PATCH] update ipmi_exporter

---
 rpmbuild/SOURCES/ipmi_exporter.env     |  3 ++-
 rpmbuild/SOURCES/ipmi_exporter.service |  6 +++---
 rpmbuild/SPECS/ipmi_exporter.spec      | 12 ++++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/rpmbuild/SOURCES/ipmi_exporter.env b/rpmbuild/SOURCES/ipmi_exporter.env
index fa0d4ce..b791326 100644
--- a/rpmbuild/SOURCES/ipmi_exporter.env
+++ b/rpmbuild/SOURCES/ipmi_exporter.env
@@ -1,3 +1,4 @@
 CONFIG_FILE=/opt/ipmi_exporter/etc/ipmi_exporter.yaml
-LISTEN_ADDRESS=:9290
+LISTEN_ADDRESS=127.0.0.1:9290
 LOG_LEVEL=info
+EXPORTER_OPTIONS=
diff --git a/rpmbuild/SOURCES/ipmi_exporter.service b/rpmbuild/SOURCES/ipmi_exporter.service
index 5345c1b..0e6cd7d 100644
--- a/rpmbuild/SOURCES/ipmi_exporter.service
+++ b/rpmbuild/SOURCES/ipmi_exporter.service
@@ -7,10 +7,10 @@ After=network-online.target
 Restart=always
 Type=simple
 EnvironmentFile=/opt/ipmi_exporter/etc/ipmi_exporter.env
-ExecStart=/opt/ipmi_exporter/bin/ipmi_exporter --config.file ${CONFIG_FILE} --web.listen-address ${LISTEN_ADDRESS} --log.level=${LOG_LEVEL}
+ExecStart=/opt/ipmi_exporter/bin/ipmi_exporter --config.file=${CONFIG_FILE} --web.listen-address=${LISTEN_ADDRESS} --log.level=${LOG_LEVEL} $EXPORTER_OPTIONS
 WorkingDirectory=/opt/ipmi_exporter/etc
-User=root
-Group=root
+User=prometheus
+Group=itix-svc
 
 [Install]
 WantedBy=multi-user.target default.target
diff --git a/rpmbuild/SPECS/ipmi_exporter.spec b/rpmbuild/SPECS/ipmi_exporter.spec
index 7a2aedc..ddc516c 100644
--- a/rpmbuild/SPECS/ipmi_exporter.spec
+++ b/rpmbuild/SPECS/ipmi_exporter.spec
@@ -42,8 +42,16 @@ install -D -m 0644 %{name}.service %{buildroot}/%{_unitdir}/%{name}.service
 %dir /opt/%{name}/bin/
 %dir /opt/%{name}/etc/
 %attr(0755, root, root) /opt/%{name}/bin/%{name}
-%attr(0600, root, root) %config /opt/%{name}/etc/%{name}.yaml
-%config /opt/%{name}/etc/%{name}.env
+%attr(0600, prometheus, itix-svc) %config(noreplace) /opt/%{name}/etc/%{name}.yaml
+%config(noreplace) /opt/%{name}/etc/%{name}.env
 %{_unitdir}/%{name}.service
 
+%pre
+getent group itix-svc >/dev/null || groupadd -r itix-svc
+getent passwd prometheus >/dev/null || useradd -r -g itix-svc \
+  -d /srv/prometheus -s /sbin/nologin -c "Prometheus monitoring" \
+  prometheus
+
+exit 0
+
 %changelog