systemd use default.target + users environment file path

Signed-off-by: Navid Yaghoobi <[email protected]>
containers · Mar 16, 2024 · b912a20 · b912a20
1 parent c60842c
commit b912a20
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/...ystemd/prometheus-podman-exporter.service → ...system/prometheus-podman-exporter.service b/...ystemd/prometheus-podman-exporter.service → ...system/prometheus-podman-exporter.service
@@ -8,4 +8,4 @@ ExecReload=/bin/kill -HUP $MAINPID
 TimeoutStopSec=20s
 SendSIGKILL=no
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target
diff --git a/...temd/prometheus-podman-exporter.sysconfig → ...stem/prometheus-podman-exporter.sysconfig b/...temd/prometheus-podman-exporter.sysconfig → ...stem/prometheus-podman-exporter.sysconfig
diff --git a/contrib/systemd/user/prometheus-podman-exporter.service b/contrib/systemd/user/prometheus-podman-exporter.service
@@ -3,6 +3,7 @@ Description=Prometheus exporter for podman (v4) machine
 [Service]
 Restart=on-failure
 EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter
+EnvironmentFile=-%h/.config/prometheus-podman-exporter
 ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS
 ExecReload=/bin/kill -HUP $MAINPID
 TimeoutStopSec=20s

diff --git a/prometheus-podman-exporter.spec.rpkg b/prometheus-podman-exporter.spec.rpkg
@@ -57,8 +57,8 @@ install -dp %{buildroot}%{_bindir}
 install -dp %{buildroot}%{_unitdir}
 install -dp %{buildroot}%{_userunitdir}
 install -p ./bin/%{name} %{buildroot}%{_bindir}
-install -Dpm0644 ./contrib/systemd/%{name}.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-install -Dpm0644 ./contrib/systemd/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
+install -Dpm0644 ./contrib/systemd/system/%{name}.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+install -Dpm0644 ./contrib/systemd/system/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
 install -Dpm0644 ./contrib/systemd/user/%{name}.service %{buildroot}%{_userunitdir}/%{name}.service
 
 pushd %{buildroot}%{_unitdir}