rpm/golang-github-prometheus-prometheus
SHA256
1
0
Fork 0
forked from pool/golang-github-prometheus-prometheus
Code Pull Requests Activity

Accepting request 957021 from home:witekbedyk:branches:server:monitoring

Browse Source 
Fix Firewalld configuration file location (bsc#1196300)

Systemwide Firewalld service configuration files are expected in `/usr/lib/firewalld/services/` instead of current `/usr/lib64/firewalld/services`.

OBS-URL: https://build.opensuse.org/request/show/957021
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/golang-github-prometheus-prometheus?expand=0&rev=52
This commit is contained in:
Witek Bedyk 2022-02-24 09:29:11 +00:00 committed by Git OBS Bridge
parent 522cfa3a17
commit 1b48191ffe
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
golang-github-prometheus-prometheus.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 22 15:27:25 UTC 2022 - Witek Bedyk <witold.bedyk@suse.com>
- Fix Firewalld configuration file location (bsc#1196300)
-------------------------------------------------------------------
Fri Feb 18 15:09:09 UTC 2022 - Witek Bedyk <witold.bedyk@suse.com>

10
golang-github-prometheus-prometheus.spec
View File

@ -97,8 +97,8 @@ install -m 0755 -d %{buildroot}%{_fillupdir}
install -m 0644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.prometheus
%if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300
install -m 0755 -d %{buildroot}%{_libdir}/firewalld/services/
install -m 0644 %{SOURCE5} %{buildroot}%{_libdir}/firewalld/services/prometheus.xml
install -m 0755 -d %{buildroot}%{_prefix}/lib/firewalld/services/
install -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/firewalld/services/prometheus.xml
%endif
install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus
@ -144,9 +144,9 @@ install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus/metrics
%config(noreplace) %{_sysconfdir}/prometheus/prometheus.yml
%if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300
%dir %{_libdir}/firewalld
%dir %{_libdir}/firewalld/services
%{_libdir}/firewalld/services/prometheus.xml
%dir %{_prefix}/lib/firewalld
%dir %{_prefix}/lib/firewalld/services
%{_prefix}/lib/firewalld/services/prometheus.xml
%endif
%changelog