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 /contrib | |
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 'contrib')
-rwxr-xr-x | contrib/debian/rules | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/contrib/debian/rules b/contrib/debian/rules index 0e17e39539..56d346aeb7 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -28,10 +28,6 @@ debian/%.postinst: debian/%.postinst.in override_dh_install: debian/netdata.postinst dh_install - # Remove unneeded .keep files - # - find "$(TOP)" -name .keep -exec rm '{}' ';' - # Set the CUPS plugin install rule # mkdir -p $(TOP)-plugin-cups/usr/libexec/netdata/plugins.d @@ -40,24 +36,9 @@ override_dh_install: debian/netdata.postinst # Set the rest of the software in the main package # - cp -rp $(TEMPTOP)/usr $(TOP)/usr - cp -rp $(TEMPTOP)/var $(TOP)/var - #cp -rp $(TEMPTOP)/etc $(TOP)/etc - - # Copy sample netdata.conf - cp -p $(CURDIR)/system/edit-config $(TOP)/etc/netdata/ - - # Create placeholder dirs in netdata configuration directory - # - mkdir -p $(TOP)/etc/netdata/health.d - mkdir -p $(TOP)/etc/netdata/python.d - mkdir -p $(TOP)/etc/netdata/charts.d - mkdir -p $(TOP)/etc/netdata/cystonm-plugins.d - mkdir -p $(TOP)/etc/netdata/go.d - mkdir -p $(TOP)/etc/netdata/ssl - mkdir -p $(TOP)/etc/netdata/node.d - mkdir -p $(TOP)/etc/netdata/statsd.d - + cp -rp $(TEMPTOP)/usr $(TOP) + cp -rp $(TEMPTOP)/var $(TOP) + cp -rp $(TEMPTOP)/etc $(TOP) # Move files that local user shouldn't be editing to /usr/share/netdata # @@ -110,10 +91,6 @@ override_dh_fixperms: chmod 0754 $(TOP)/usr/libexec/netdata/plugins.d/slabinfo.plugin chmod 0750 $(TOP)/usr/libexec/netdata/plugins.d/go.d.plugin - # Support script for configuration file management - # - chmod 0750 $(TOP)/etc/netdata/edit-config - # CUPS plugin package chmod 0750 $(TOP)-plugin-cups/usr/libexec/netdata/plugins.d/cups.plugin |