Merging upstream version 1.41.0.

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

3 files changed, 8 insertions, 0 deletions

diff --git a/contrib/debian/conffiles b/contrib/debian/conffiles
index 5ea613f3..1ec90254 100644
--- a/contrib/debian/conffiles
+++ b/contrib/debian/conffiles
@@ -2,3 +2,4 @@
 /etc/init.d/netdata
 /etc/logrotate.d/netdata
 /etc/netdata/netdata.conf
+/etc/netdata/netdata-updater.conf
diff --git a/contrib/debian/netdata.postinst b/contrib/debian/netdata.postinst
index 15ffeaf7..1da46cc8 100644
--- a/contrib/debian/netdata.postinst
+++ b/contrib/debian/netdata.postinst
@@ -42,6 +42,7 @@ case "$1" in
     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/local-listeners
 
     # Workaround for other plugins not installed directly by this package
     chmod -f 4750 /usr/libexec/netdata/plugins.d/ioping || true
diff --git a/contrib/debian/rules b/contrib/debian/rules
index 314424fc..3fe4e63f 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -207,6 +207,12 @@ override_dh_fixperms:
 	# NFACCT plugin package
 	chmod 4750 $(TOP)-plugin-nfacct/usr/libexec/netdata/plugins.d/nfacct.plugin
 
+	# cgroup-network
+	chmod 4750 $(TOP)/usr/libexec/netdata/plugins.d/cgroup-network
+
+	# local-listeners
+	chmod 4750 $(TOP)/usr/libexec/netdata/plugins.d/local-listeners
+
 override_dh_installlogrotate:
 	cp system/logrotate/netdata debian/netdata.logrotate
 	dh_installlogrotate