Fixes enable/start of netdata service in debian package (#9005)

Also cleanup unused templating in postint

Signed-off-by: Arthur Outhenin-Chalandre <arthur@cri.epita.fr>

4 files changed, 7 insertions, 19 deletions

diff --git a/contrib/debian/netdata.postinst.in b/contrib/debian/netdata.postinst
index 1518aa479f..cc1b40feff 100644
--- a/contrib/debian/netdata.postinst.in
+++ b/contrib/debian/netdata.postinst
@@ -67,4 +67,6 @@ case "$1" in
     ;;
 esac
 
+#DEBHELPER#
+
 exit 0
diff --git a/contrib/debian/netdata.postrm b/contrib/debian/netdata.postrm
index e66ac896f3..5644e22a51 100644
--- a/contrib/debian/netdata.postrm
+++ b/contrib/debian/netdata.postrm
@@ -48,4 +48,6 @@ case "$1" in
 
 esac
 
+#DEBHELPER#
+
 exit 0
diff --git a/contrib/debian/netdata.preinst b/contrib/debian/netdata.preinst
index c4da80fcca..3bbdea0b37 100644
--- a/contrib/debian/netdata.preinst
+++ b/contrib/debian/netdata.preinst
@@ -14,3 +14,5 @@ dpkg-maintscript-helper dir_to_symlink \
 	/var/lib/netdata/www/lib /usr/share/netdata/www/lib 1.18.1~ netdata -- "$@"
 dpkg-maintscript-helper dir_to_symlink \
 	/var/lib/netdata/www/static /usr/share/netdata/www/static 1.18.1~ netdata -- "$@"
+
+#DEBHELPER#
diff --git a/contrib/debian/rules b/contrib/debian/rules
index 22c2b82caf..97bee36280 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -2,7 +2,6 @@
 
 # Find the arch we are building for, as this determines
 # the location of plugins in /usr/lib
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 TOP = $(CURDIR)/debian/netdata
 TEMPTOP = $(CURDIR)/debian/tmp
 
@@ -41,10 +40,7 @@ override_dh_auto_configure:
 	dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib \
 	--libexecdir=/usr/libexec --with-user=netdata --with-math --with-zlib --with-webdir=/var/lib/netdata/www
 
-debian/%.postinst: debian/%.postinst.in
-	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
-
-override_dh_install: debian/netdata.postinst
+override_dh_install:
 	cp -v $(BASE_CONFIG) debian/netdata.conf
 
 	dh_install
@@ -80,19 +76,6 @@ override_dh_install: debian/netdata.postinst
 		ln -s "/usr/share/netdata/www/$$D" "$(TOP)/var/lib/netdata/www/$$D"; \
 	done
 
-	# Update postinst to set correct group for www files on installation.
-	# Should probably be dpkg-statoverride really, but that gets *really*
-	# messy. We also set all web files in /var as conffiles so an upgrade
-	# doesn't splat them.
-	#
-	for D in $$(find "$(TOP)/var/lib/netdata/www/" -maxdepth 1 -type f -printf '%f '); do \
-		echo Updating postinst for $$D; \
-		sed -i "s/^#PERMS#/chgrp netdata \/var\/lib\/netdata\/www\/$$D\n#PERMS#/g" \
-			$(CURDIR)/debian/netdata.postinst; \
-		echo "/var/lib/netdata/www/$$D" >> $(CURDIR)/debian/netdata.conffiles; \
-	done
-	sed -i "/^#PERMS#/d" $(CURDIR)/debian/netdata.postinst
-
 	# Install go
 	#
 	debian/install_go.sh $$(cat ${CURDIR}/packaging/go.d.version) $(TOP)/usr/lib/netdata $(TOP)/usr/libexec/netdata
@@ -137,5 +120,4 @@ override_dh_clean:
 	# Tidy up copied/generated files
 	#
 	-[ -r $(CURDIR)/debian/netdata.logrotate ] && rm $(CURDIR)/debian/netdata.logrotate
-	-[ -r $(CURDIR)/debian/netdata.postinst ] && rm $(CURDIR)/debian/netdata.postinst
 	-[ -r $(CURDIR)/debian/netdata.conffiles ] && rm $(CURDIR)/debian/netdata.conffiles