Adding upstream version 1.38.0.upstream/1.38.0

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

2 files changed, 6 insertions, 2 deletions

diff --git a/contrib/debian/netdata.postinst b/contrib/debian/netdata.postinst
index daea8cb40..5cce2c3d1 100644
--- a/contrib/debian/netdata.postinst
+++ b/contrib/debian/netdata.postinst
@@ -16,7 +16,7 @@ dpkg-maintscript-helper dir_to_symlink \
   /var/lib/netdata/www/static /usr/share/netdata/www/static 1.18.1~ netdata -- "$@"
 
 case "$1" in
-  configure|recnfigure)
+  configure|reconfigure)
     if ! getent group netdata > /dev/null; then
       addgroup --quiet --system netdata
     fi
@@ -30,6 +30,11 @@ case "$1" in
         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
diff --git a/contrib/debian/rules b/contrib/debian/rules
index 5be3e81c5..a4820cd4a 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -95,7 +95,6 @@ override_dh_installdocs:
 
 	find . \
 		-name README.md \
-		-not -path './.travis/*' \
 		-not -path './debian/*' \
 		-not -path './contrib/*' \
 		-exec cp \