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 /collectors/Makefile.am | |
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 'collectors/Makefile.am')
-rw-r--r-- | collectors/Makefile.am | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/collectors/Makefile.am b/collectors/Makefile.am index 3bdc6bb3db..7431025704 100644 --- a/collectors/Makefile.am +++ b/collectors/Makefile.am @@ -27,6 +27,14 @@ SUBDIRS = \ tc.plugin \ $(NULL) +usercustompluginsconfigdir=$(configdir)/custom-plugins.d +usergoconfigdir=$(configdir)/go.d + +# Explicitly install directories to avoid permission issues due to umask +install-exec-local: + $(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir) + $(INSTALL) -d $(DESTDIR)$(usergoconfigdir) + dist_noinst_DATA = \ README.md \ $(NULL) |