lock down and fix %files section

diff --git a/netdata.spec.in b/netdata.spec.in
index 884aa3fcdbe1479015f6f53a68f9700334672920..1dddbe19ee20af24ef79956cfb020061fcc06fe3 100644 (file)
--- a/netdata.spec.in
+++ b/netdata.spec.in
@@ -129,16 +129,22 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%attr(-,netdata,netdata) %dir %{_localstatedir}/cache/%{name}
-%attr(-,netdata,netdata) %dir %{_localstatedir}/log/%{name}
+%defattr(-,root,root)
+
+%dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*.conf
 %config(noreplace) %{_sysconfdir}/%{name}/python.d/*.conf
-%dir %{_sysconfdir}/%{name}
-%{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+
 %{_libexecdir}/%{name}
 %{_sbindir}/%{name}
+
+%attr(0700,netdata,netdata) %dir %{_localstatedir}/cache/%{name}
+%attr(0700,netdata,netdata) %dir %{_localstatedir}/log/%{name}
+%attr(0700,netdata,netdata) %dir %{_localstatedir}/lib/%{name}
+
 %dir %{_datadir}/%{name}
-%dir %{_sharedstatedir}/%{name}
+%attr(-,root,netdata) %{_datadir}/%{name}/web
 
 %if %{with systemd}
 %{_unitdir}/netdata.service
@@ -146,10 +152,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rc.d/init.d/netdata
 %endif
 
-# override defattr for web files
-%defattr(644,root,netdata,755)
-%{_datadir}/%{name}/web
-
 %changelog
 * Tue Jul 26 2016 Jason Barnett <J@sonBarnett.com> - 1.2.0-2
 - Added support for EL6