Adding upstream version 1.40.0.upstream/1.40.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 1 insertions, 37 deletions

diff --git a/contrib/debian/netdata.postinst b/contrib/debian/netdata.postinst
index 5cce2c3d1..15ffeaf7b 100644
--- a/contrib/debian/netdata.postinst
+++ b/contrib/debian/netdata.postinst
@@ -17,25 +17,6 @@ dpkg-maintscript-helper dir_to_symlink \
 
 case "$1" in
   configure|reconfigure)
-    if ! getent group netdata > /dev/null; then
-      addgroup --quiet --system netdata
-    fi
-
-    if ! getent passwd netdata > /dev/null; then
-      adduser --quiet --system --ingroup netdata --home /var/lib/netdata --no-create-home netdata
-    fi
-
-    for item in docker nginx varnish haproxy adm nsd proxy squid ceph nobody I2C; do
-      if getent group $item > /dev/null 2>&1; then
-        usermod -a -G $item netdata
-      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" ] && getent group "www-data" > /dev/null 2>&1; then
-      usermod -a -G www-data netdata
-    fi
-
     if ! dpkg-statoverride --list /var/lib/netdata > /dev/null 2>&1; then
       dpkg-statoverride --update --add netdata netdata 0755 /var/lib/netdata
     fi
@@ -58,28 +39,11 @@ case "$1" in
 
     dpkg-statoverride --force --update --add root netdata 0775 /var/lib/netdata/registry > /dev/null 2>&1
 
-    chown -R root:netdata /usr/libexec/netdata/plugins.d
-    setcap cap_dac_read_search,cap_sys_ptrace+ep /usr/libexec/netdata/plugins.d/apps.plugin
-    setcap cap_dac_read_search+ep /usr/libexec/netdata/plugins.d/slabinfo.plugin
-
-    if capsh --supports=cap_perfmon 2>/dev/null; then
-        setcap cap_perfmon+ep /usr/libexec/netdata/plugins.d/perf.plugin
-    else
-        setcap cap_sys_admin+ep /usr/libexec/netdata/plugins.d/perf.plugin
-    fi
-
-    if [ -f "/usr/libexec/netdata/plugins.d/go.d.plugin" ]; then
-      setcap "cap_net_admin+epi cap_net_raw=eip" /usr/libexec/netdata/plugins.d/go.d.plugin
-    fi
+    grep /usr/libexec/netdata /var/lib/dpkg/info/netdata.list | xargs -n 30 chown root:netdata
 
     chmod 4750 /usr/libexec/netdata/plugins.d/cgroup-network
-    chmod 4750 /usr/libexec/netdata/plugins.d/nfacct.plugin
-
-    # Workaround if system does not have ebpf.plugin
-    chmod -f 4750 /usr/libexec/netdata/plugins.d/ebpf.plugin || true
 
     # Workaround for other plugins not installed directly by this package
-    chmod -f 4750 /usr/libexec/netdata/plugins.d/freeipmi.plugin || true
     chmod -f 4750 /usr/libexec/netdata/plugins.d/ioping || true
 
     ;;