diff options
| author | Konstantinos Natsakis <5933427+knatsakis@users.noreply.github.com> | 2019-11-11 21:16:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-11 21:16:42 +0200 |
| commit | 1094175c3bd08ecf5c83c91605e9fd1d02052108 (patch) | |
| tree | dc09f1a67fc5b230fb294ac884a8d49ecb23d88d /netdata.spec.in | |
| parent | be75567a7d8cbec27030fa2bb6acc66aaa852154 (diff) | |
Ownership and permissions of /etc/netdata (#7244)
* make install takes care of ownership and permissions of /etc/netdata
Instead of netdata-installer.sh
* Fix identation in Makefile.am files
* netdata-installer.sh: Clearer variable assignment
* netdata-installer.sh: Set /etc/netdata/netdata.conf ownership to root:root and permissions to 0644
* netdata-installer.sh: Set /etc/netdata/.environment permissions to 0644
* install-or-update.sh: Set permissions for /opt/netdata/etc/netdata.conf to 0644
* install-or-update.sh: Use ${NETDATA_PREFIX} more
* install-or-update.sh: Improve indentation
* install-or-update.sh: Do not create /opt/netdata/etc/netdata directories
* debian/rules: /etc/netdata files and directories are now installed by make install
* debian/rules: Properly copy files across directories
When destination directory exists
* netdata.spec.in: /etc/netdata ownership and permissions
* Revert "Fix identation in Makefile.am files"
This reverts commit 63fdb299b69152fda6984f81b0fef02f364c5efe.
* Remove uninstall-local recipes from Makefile.am files
* Removed superfluous whitespace and hash
Diffstat (limited to 'netdata.spec.in')
| -rw-r--r-- | netdata.spec.in | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/netdata.spec.in b/netdata.spec.in index edf6a6c364..405e8f50e2 100644 --- a/netdata.spec.in +++ b/netdata.spec.in @@ -256,7 +256,7 @@ autoreconf -ivf rm -rf "${RPM_BUILD_ROOT}" %{__make} %{?_smp_mflags} DESTDIR="${RPM_BUILD_ROOT}" install -find "${RPM_BUILD_ROOT}" -name .keep -delete +find "${RPM_BUILD_ROOT}%{_localstatedir}" -name .keep -delete -print install -m 644 -p system/netdata.conf "${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}" @@ -290,9 +290,6 @@ install -m 4750 -p slabinfo.plugin "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plug # ########################################################### # Install registry directory install -m 755 -d "${RPM_BUILD_ROOT}%{_localstatedir}/lib/%{name}/registry" -install -m 755 -d "${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/custom-plugins.d" -install -m 755 -d "${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/go.d" -install -m 755 -d "${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/ssl" # ########################################################### # Install netdata service @@ -423,12 +420,12 @@ rm -rf "${RPM_BUILD_ROOT}" %files %doc README.md -%defattr(-,root,netdata) +%{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/netdata.conf -%dir %{_sysconfdir}/%{name} +%defattr(-,root,netdata) %dir %{_libdir}/%{name} -%config(noreplace) %{_sysconfdir}/%{name}/*.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{_libdir}/%{name} @@ -436,7 +433,6 @@ rm -rf "${RPM_BUILD_ROOT}" %defattr(0755,netdata,netdata,0755) %{_libexecdir}/%{name} %{_sbindir}/%{name} -%{_sysconfdir}/%{name}/edit-config %defattr(4750,root,netdata,0750) @@ -466,15 +462,6 @@ rm -rf "${RPM_BUILD_ROOT}" %dir %{_datadir}/%{name} %defattr(0750,netdata,netdata,0755) - -%dir %{_sysconfdir}/%{name}/health.d -%dir %{_sysconfdir}/%{name}/python.d -%dir %{_sysconfdir}/%{name}/charts.d -%dir %{_sysconfdir}/%{name}/custom-plugins.d -%dir %{_sysconfdir}/%{name}/go.d -%dir %{_sysconfdir}/%{name}/ssl -%dir %{_sysconfdir}/%{name}/node.d -%dir %{_sysconfdir}/%{name}/statsd.d %{_libdir}/%{name}/conf.d/ %if %{with systemd} @@ -515,6 +502,8 @@ Use this plugin to enable metrics collection from cupsd, the daemon running when %endif %changelog +* Mon Nov 04 2019 Konstantinos Natsakis <konstantinos.natsakis@gmail.com> 0.0.0-10 +- Fix /etc/netdata permissions * Mon Sep 23 2019 Konstantinos Natsakis <konstantinos.natsakis@gmail.com> 0.0.0-9 - Do not build CUPS plugin subpackage on CentOS 6 and CentOS 7 * Tue Aug 20 2019 Pavlos Emm. Katsoulakis <paul@netdat.acloud> - 0.0.0-8 |