Accepting request 714592 from home:jfajerski:branches:server:monitoring

- spec file change:
  * alter permissions of /etc/grafana and /var/lib/grafana to 755
  * alter owner of /etc/grafana/provisioning/dashboards tree to root:root
  * this allows installing dashboards via rpms without these rpms depending on this rpm

OBS-URL: https://build.opensuse.org/request/show/714592
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=18
This commit is contained in:
Joao Cavalheiro 2019-07-11 08:39:07 +00:00 committed by Git OBS Bridge
parent d2eb4e1889
commit b11b17052b
2 changed files with 15 additions and 7 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jul 11 08:21:07 UTC 2019 - Jan Fajerski <jan.fajerski@suse.com>
- spec file change:
* alter permissions of /etc/grafana and /var/lib/grafana to 755
* alter owner of /etc/grafana/provisioning/dashboards tree to root:root
* this allows installing dashboards via rpms without these rpms depending on this rpm
-------------------------------------------------------------------
Tue Jun 25 19:12:43 UTC 2019 - dmueller@suse.com

View File

@ -132,15 +132,15 @@ getent passwd %{GRAFANA_GROUP} > /dev/null || useradd -r -g %{GRAFANA_GROUP} \
%{_sbindir}/rc%{name}-server
%{_unitdir}/%{name}-server.service
%{_fillupdir}/sysconfig.%{name}-server
%attr(0750,root,%{GRAFANA_GROUP}) %dir %{_sysconfdir}/%{name}
%attr(0750,root,%{GRAFANA_GROUP}) %dir %{_sysconfdir}/%{name}/provisioning
%attr(0750,root,%{GRAFANA_GROUP}) %dir %{_sysconfdir}/%{name}/provisioning/dashboards
%attr(0750,root,%{GRAFANA_GROUP}) %dir %{_datadir}/%{name}/conf
%attr(0755,root,root) %dir %{_sysconfdir}/%{name}
%attr(0755,root,root) %dir %{_sysconfdir}/%{name}/provisioning
%attr(0755,root,root) %dir %{_sysconfdir}/%{name}/provisioning/dashboards
%attr(0755,root,%{GRAFANA_GROUP}) %dir %{_datadir}/%{name}/conf
%attr(0640,root,%{GRAFANA_GROUP}) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini
%attr(0640,root,%{GRAFANA_GROUP}) %config(noreplace) %{_sysconfdir}/%{name}/ldap.toml
%attr(0750,%{GRAFANA_USER},%{GRAFANA_GROUP}) %dir %{_localstatedir}/lib/%{name}
%attr(0750,%{GRAFANA_USER},%{GRAFANA_GROUP}) %dir %{_localstatedir}/lib/%{name}/plugins
%attr(0750,%{GRAFANA_USER},%{GRAFANA_GROUP}) %dir %{_localstatedir}/lib/%{name}/dashboards
%attr(0755,%{GRAFANA_USER},%{GRAFANA_GROUP}) %dir %{_localstatedir}/lib/%{name}
%attr(0755,%{GRAFANA_USER},%{GRAFANA_GROUP}) %dir %{_localstatedir}/lib/%{name}/plugins
%attr(0755,%{GRAFANA_USER},%{GRAFANA_GROUP}) %dir %{_localstatedir}/lib/%{name}/dashboards
%attr(0750,%{GRAFANA_USER},%{GRAFANA_GROUP}) %dir %{_localstatedir}/log/%{name}
%doc %{_datadir}/%{name}/conf/sample.ini
%doc %{_datadir}/%{name}/conf/provisioning/dashboards/sample.yaml