Merge remote-tracking branch 'firehol/master'

[netdata.git] / netdata.spec.in

diff --git a/netdata.spec.in b/netdata.spec.in
index f2307f6f82c626af2513c0f06dea49d811c094e7..68a69ad7d425607bf0a943bb0856c11685623682 100644 (file)
--- a/netdata.spec.in
+++ b/netdata.spec.in
@@ -18,7 +18,7 @@
 Summary:       Real-time performance monitoring, done right
 Name:          @PACKAGE_NAME@
 Version:       @PACKAGE_RPM_VERSION@
-Release:       @PACKAGE_RPM_RELEASE@%{?release_suffix}%{?dist}
+Release:       1%{?dist}
 License:       GPL v3+
 Group:         Applications/System
 Source0:       http://firehol.org/download/netdata/releases/v@PACKAGE_VERSION@/%{name}-@PACKAGE_VERSION@.tar.xz
@@ -142,16 +142,21 @@ exit 0
 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}
 
 %if %{with systemd}
 %{_unitdir}/netdata.service
@@ -159,8 +164,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rc.d/init.d/netdata
 %endif
 
-# override defattr for web files
-%defattr(644,root,netdata,755)
+# Enforce 0644 for files and 0755 for directories
+# for the netdata web directory
+%defattr(0644,root,netdata,0755)
 %{_datadir}/%{name}/web
 
 %changelog