From d079b656b4719739b2247dcd9d46e9bec793095a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 6 Feb 2023 17:11:34 +0100 Subject: Merging upstream version 1.38.0. Signed-off-by: Daniel Baumann --- packaging/makeself/install-or-update.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'packaging/makeself/install-or-update.sh') diff --git a/packaging/makeself/install-or-update.sh b/packaging/makeself/install-or-update.sh index be2b2f75f..52a23fc70 100755 --- a/packaging/makeself/install-or-update.sh +++ b/packaging/makeself/install-or-update.sh @@ -27,7 +27,7 @@ fi STARTIT=1 REINSTALL_OPTIONS="" -RELEASE_CHANNEL="nightly" # check .travis/create_artifacts.sh before modifying +RELEASE_CHANNEL="nightly" while [ "${1}" ]; do case "${1}" in @@ -121,6 +121,11 @@ if portable_add_group netdata; then run_failed "Failed to add netdata user to secondary groups" fi done + # Netdata must be able to read /etc/pve/qemu-server/* and /etc/pve/lxc/* + # for reading VMs/containers names, CPU and memory limits on Proxmox. + if [ -d "/etc/pve" ]; then + portable_add_user_to_group "www-data" netdata && NETDATA_ADDED_TO_GROUPS="${NETDATA_ADDED_TO_GROUPS} www-data" + fi NETDATA_USER="netdata" NETDATA_GROUP="netdata" else @@ -218,12 +223,6 @@ if [ -f "usr/libexec/netdata/plugins.d/go.d.plugin" ] && command -v setcap 1>/de run setcap "cap_net_admin+epi cap_net_raw=eip" "usr/libexec/netdata/plugins.d/go.d.plugin" fi -# fix the fping binary -if [ -f bin/fping ]; then - run chown root:${NETDATA_GROUP} bin/fping - run chmod 4750 bin/fping -fi - # ----------------------------------------------------------------------------- echo "Configure TLS certificate paths" -- cgit v1.2.3