From 6ea618fce10f44f29f997f3d9d87bc301137ca2d Mon Sep 17 00:00:00 2001
From: Soulou <leo@unbekandt.eu>
Date: Mon, 14 Dec 2015 00:06:54 +0100
Subject: Correctly stop on SIGINT/SIGTERM signals

---
 Dockerfile     | 3 +--
 start-munin.sh | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 34073bf..738b909 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,5 +20,4 @@ ADD ./munin-update-logging.patch /usr/share/munin
 RUN cd /usr/share/munin && patch munin-graph < munin-graph-logging.patch && patch munin-update < munin-update-logging.patch
 
 EXPOSE 8080
-CMD bash /munin
-
+CMD ["bash", "/munin"]
diff --git a/start-munin.sh b/start-munin.sh
index b2a6d78..c3aa70b 100644
--- a/start-munin.sh
+++ b/start-munin.sh
@@ -88,14 +88,16 @@ fi
 /usr/sbin/munin-node
 echo "Using the following munin nodes:"
 echo $NODES
-# start apache
+# start nginx
 /usr/sbin/nginx
 # show logs
 echo "Tailing /var/log/syslog..."
 tail -F /var/log/syslog /var/log/munin/munin-update.log & pid=$!
+echo "tail -F running in $pid"
 
 sleep 1
 
-trap "kill $pid $(cat /var/run/munin/munin-node.pid) $(cat /var/run/nginx.pid) $(cat /var/run/crond.pid) $(cat /var/run/rsyslogd.pid)" TERM QUIT INT
+trap "echo 'stopping processes' ; kill $pid $(cat /var/run/munin/munin-node.pid) $(cat /var/run/nginx.pid) $(cat /var/run/crond.pid) $(cat /var/run/rsyslogd.pid)" SIGTERM SIGINT
 
+echo "Waiting for signal SIGINT/SIGTERM"
 wait
-- 
cgit v1.2.1