From 7f6acdb79178f7c2c4ccbfc9354236b227cb4c04 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Mon, 10 Jun 2019 21:53:44 +0200
Subject: [PATCH] [Watchdog] Fix for fix for wrong mails

---
 data/Dockerfiles/watchdog/watchdog.sh | 9 ---------
 docker-compose.yml                    | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/data/Dockerfiles/watchdog/watchdog.sh b/data/Dockerfiles/watchdog/watchdog.sh
index 34ad86b6..70dc031d 100755
--- a/data/Dockerfiles/watchdog/watchdog.sh
+++ b/data/Dockerfiles/watchdog/watchdog.sh
@@ -77,15 +77,6 @@ function mail_error() {
       log_msg "Cannot determine MX for ${rcpt}, skipping email notification..."
       return 1
     fi
-    # Some exceptions for subject and body formats
-    if [[ ${1} == "watchdog-mailcow" ]]; then
-      SUBJECT="Watchdog started"
-    elif [[ ${1} == "fail2ban" ]]; then
-      SUBJECT="${BODY}"
-      BODY="Please see netfilter-mailcow for more details and triggered rules."
-    else
-      SUBJECT="Watchdog: ${1} triggered an event"
-    fi
     [ -f "/tmp/${1}" ] && ATTACH="--attach /tmp/${1}@text/plain" || ATTACH=
     ./smtp-cli --missing-modules-ok \
       --subject="${SUBJECT}" \
diff --git a/docker-compose.yml b/docker-compose.yml
index 9d67a35e..a2f97201 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -364,7 +364,7 @@ services:
         - /lib/modules:/lib/modules:ro
 
     watchdog-mailcow:
-      image: mailcow/watchdog:1.44
+      image: mailcow/watchdog:1.45
       # Debug
       #command: /watchdog.sh
       build: ./data/Dockerfiles/watchdog