spec: merge apps.plugin
reorder so that caps will take affect as apps.plugin appears twice (libexec + explicit) Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Alon Bar-Lev committed
Feb 19, 2017 at 14:50 UTC
8e2d4ffa132c464480ad20bf15cc3dff27548889
1 file changed
+2
-5
netdata.spec.in
+2
-5
@@ -133,7 +133,6 @@ install -m 755 system/netdata-init-d \
133
134
%post
135
%distro_post
136
-setcap cap_dac_read_search,cap_sys_ptrace+ep /usr/libexec/netdata/plugins.d/apps.plugin || chmod 1755 /usr/libexec/netdata/plugins.d/apps.plugin
136
137
%preun
138
%distro_preun
@@ -151,7 +150,6 @@ getent passwd netdata >/dev/null || \
150
exit 0
151
152
%post
154
-setcap cap_dac_read,cap_sys_ptrace+ep /usr/libexec/netdata/plugins.d/apps.plugin || chmod 1755 /usr/libexec/netdata/plugins.d/apps.plugin
153
# Register the netdata service
154
/sbin/chkconfig --add netdata
155
# Only gets run on initial install (not upgrades or uninstalls)
@@ -195,12 +193,11 @@ rm -rf "${RPM_BUILD_ROOT}"
193
194
# To be eventually moved to %%_defaultdocdir
195
%{_sysconfdir}/%{name}/node.d/*.md
198
-
199
-%caps(cap_dac_read_search,cap_sys_ptrace=ep) %{_libexecdir}/%{name}/plugins.d/apps.plugin
200
-
196
%{_libexecdir}/%{name}
197
%{_sbindir}/%{name}
198
199
+%caps(cap_dac_read_search,cap_sys_ptrace=ep) %attr(0555,root,root) %{_libexecdir}/%{name}/plugins.d/apps.plugin
200
+
201
%attr(0700,netdata,netdata) %dir %{_localstatedir}/cache/%{name}
202
%attr(0700,netdata,netdata) %dir %{_localstatedir}/log/%{name}
203
%attr(0700,netdata,netdata) %dir %{_localstatedir}/lib/%{name}