]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
build/ops: rpm: make ceph-grafana-dashboards own its directories on SUSE 25347/head
authorNathan Cutler <ncutler@suse.com>
Fri, 30 Nov 2018 12:11:13 +0000 (13:11 +0100)
committerNathan Cutler <ncutler@suse.com>
Fri, 7 Dec 2018 15:16:42 +0000 (16:16 +0100)
This is only required to get the spec file to build in the OpenSUSE
Build Service (OBS). Also, this change could potentially make the
package impossible to install together with grafana (if the latter
owns the same directories with different ownership/permissions).
Therefore, make the change specific to SUSE.

Fixes: http://tracker.ceph.com/issues/37485
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
ceph.spec.in

index 4929d08341c981d8d05f6385b1acec886900cbde..4342d79b5a5b0eceb55e7126dcc99081c0e1bb1e 100644 (file)
@@ -2014,7 +2014,13 @@ exit 0
 %endif
 
 %files grafana-dashboards
+%if 0%{?suse_version}
+%attr(0750,root,grafana) %dir %{_sysconfdir}/grafana
+%attr(0750,root,grafana) %dir %{_sysconfdir}/grafana/dashboards
+%attr(0750,root,grafana) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
+%else
 %attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
+%endif
 %config %{_sysconfdir}/grafana/dashboards/ceph-dashboard/*
 %doc monitoring/grafana/dashboards/README
 %doc monitoring/grafana/README.md