Using dh-apache2 ito do the heavy-lifting for netdata-apache2.

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

6 files changed, 3 insertions, 33 deletions

diff --git a/debian/control b/debian/control
index b934c52e6..512eb616b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Uploaders:
  Daniel Baumann <daniel.baumann@progress-linux.org>,
 Build-Depends:
  debhelper-compat (= 12),
+ dh-apache2,
  libipmimonitoring-dev,
  pkg-config,
  uuid-dev,
diff --git a/debian/netdata-apache2.apache2 b/debian/netdata-apache2.apache2
new file mode 100644
index 000000000..0ff4a8dd3
--- /dev/null
+++ b/debian/netdata-apache2.apache2
@@ -0,0 +1 @@
+conf debian/local/apache2/netdata.conf
diff --git a/debian/netdata-apache2.install b/debian/netdata-apache2.install
deleted file mode 100644
index 4338e0a70..000000000
--- a/debian/netdata-apache2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/local/apache2/*.conf etc/apache2/conf-available
diff --git a/debian/netdata-apache2.postinst b/debian/netdata-apache2.postinst
index 7c8e0ce28..037bdca7b 100644..100755
--- a/debian/netdata-apache2.postinst
+++ b/debian/netdata-apache2.postinst
@@ -12,8 +12,6 @@ case "${1}" in
 			apache2_invoke enmod proxy_http
 			apache2_invoke enmod rewrite
 
-			apache2_invoke enconf netdata.conf
-
 			apache2_reload restart
 		fi
 		;;
diff --git a/debian/netdata-apache2.postrm b/debian/netdata-apache2.postrm
deleted file mode 100644
index b69fdbc16..000000000
--- a/debian/netdata-apache2.postrm
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "${1}" in
-	remove)
-		if [ -e /usr/share/apache2/apache2-maintscript-helper ]
-		then
-			. /usr/share/apache2/apache2-maintscript-helper
-
-			apache2_invoke disconf netdata.conf
-
-			apache2_reload restart
-		fi
-		;;
-
-	purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-		;;
-
-	*)
-		echo "postrm called with unknown argument \`${1}'" >&2
-		exit 1
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index 84514eb67..ed65ae8ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ export DEB_CFLAGS_MAINT_APPEND  = -Wall -O3
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 %:
-	dh $@
+	dh ${@} --with apache2
 
 override_dh_autoreconf:
 	rm -f debian/configure.ac.orig