From 453313876b160bdc672fd7cdaf181412d31b745d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Mon, 19 Dec 2016 22:06:12 +0100
Subject: Updating irc notification handling for new upstream where the
 notification is a hook now.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 debian/open-infrastructure-container-tools.config   |  2 +-
 debian/open-infrastructure-container-tools.links    |  2 ++
 debian/open-infrastructure-container-tools.postinst | 16 ++++++++--------
 3 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 debian/open-infrastructure-container-tools.links

diff --git a/debian/open-infrastructure-container-tools.config b/debian/open-infrastructure-container-tools.config
index ad0569c..99c2317 100644
--- a/debian/open-infrastructure-container-tools.config
+++ b/debian/open-infrastructure-container-tools.config
@@ -52,7 +52,7 @@ if [ -e "${CONFFILE}" ]
 then
 	. ${CONFFILE} || true
 
-	db_set open-infrastructure-container-tools/irc "${IRK_TARGETS}"
+	db_set open-infrastructure-container-tools/irc "${IRC_CHANNELS}"
 fi
 
 db_settitle open-infrastructure-container-tools/title
diff --git a/debian/open-infrastructure-container-tools.links b/debian/open-infrastructure-container-tools.links
new file mode 100644
index 0000000..946af66
--- /dev/null
+++ b/debian/open-infrastructure-container-tools.links
@@ -0,0 +1,2 @@
+/usr/share/container-tools/hooks/irc	/etc/container-tools/hooks/pre-container.irc
+/usr/share/container-tools/hooks/log	/etc/container-tools/hooks/pre-container.log
diff --git a/debian/open-infrastructure-container-tools.postinst b/debian/open-infrastructure-container-tools.postinst
index 4273247..4d1a324 100755
--- a/debian/open-infrastructure-container-tools.postinst
+++ b/debian/open-infrastructure-container-tools.postinst
@@ -2,7 +2,7 @@
 
 set -e
 
-CONFFILE="/etc/default/container-tools"
+CONFFILE="/etc/container-tools/hooks/pre-container.irc.conf"
 
 Install ()
 {
@@ -63,7 +63,7 @@ case "${1}" in
 		SCRIPT="${RET:-debian}" # string (w/o empty)
 
 		db_get open-infrastructure-container-tools/irc
-		IRK_TARGETS="${RET}" # string (w/ empty)
+		IRC_CHANNELS="${RET}" # string (w/ empty)
 
 		db_stop
 
@@ -78,9 +78,9 @@ case "${1}" in
 		then
 
 cat > "${CONFFILE}" << EOF
-# /etc/default/container-tools
+# /etc/container-tools/hooks/pre-container.irc.conf
 
-IRK_TARGETS="${IRK_TARGETS}"
+IRC_CHANNELS="${IRC_CHANNELS}"
 EOF
 
 		fi
@@ -90,11 +90,11 @@ EOF
 		# If the admin deleted or commented some variables but then set
 		# them via debconf, (re-)add them to the config file.
 
-		test -z "${IRK_TARGETS}" || \
-			grep -Eq '^ *IRK_TARGETS=' "${CONFFILE}" || \
-			echo "IRK_TARGETS=" >> "${CONFFILE}"
+		test -z "${IRC_CHANNELS}" || \
+			grep -Eq '^ *IRC_CHANNELS=' "${CONFFILE}" || \
+			echo "IRC_CHANNELS=" >> "${CONFFILE}"
 
-		sed -e "s|^ *IRK_TARGETS=.*|IRK_TARGETS=\"${IRK_TARGETS}\"|" \
+		sed -e "s|^ *IRC_CHANNELS=.*|IRC_CHANNELS=\"${IRC_CHANNELS}\"|" \
 		< "${CONFFILE}" > "${CONFFILE}.tmp"
 
 		mv -f "${CONFFILE}.tmp" "${CONFFILE}"
-- 
cgit v1.2.3