From 67ff97b27dee12ff98b4e9c2df3b002e50ae96ce Mon Sep 17 00:00:00 2001
From: Asaf Gartner <asaf@handmadedev.org>
Date: Sat, 4 Sep 2021 21:48:47 +0300
Subject: [PATCH] Try another method for crash mailing

---
 server/adminmailer.sh | 4 ++++
 server/caddy.service  | 2 +-
 server/cinera.service | 2 +-
 server/hmn.service    | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/server/adminmailer.sh b/server/adminmailer.sh
index f2a9048f..f4a6e8c1 100755
--- a/server/adminmailer.sh
+++ b/server/adminmailer.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+if [ $SERVICE_RESULT == "success" ]; then
+	exit
+fi
+
 /home/hmn/hmn/adminmailer/adminmailer "[$1] Status changed" <<ERRMAIL
 $(service "$1" status)
 ERRMAIL
diff --git a/server/caddy.service b/server/caddy.service
index f0ea0129..8244dc57 100644
--- a/server/caddy.service
+++ b/server/caddy.service
@@ -28,7 +28,7 @@ LimitNPROC=512
 PrivateTmp=true
 ProtectSystem=full
 AmbientCapabilities=CAP_NET_BIND_SERVICE
-OnFailure=status-email@%n.service
+ExecStopPost=status-email@%n.service
 
 [Install]
 WantedBy=multi-user.target
diff --git a/server/cinera.service b/server/cinera.service
index 0282f76a..c7cb8390 100644
--- a/server/cinera.service
+++ b/server/cinera.service
@@ -10,7 +10,7 @@ ExecStart=/home/hmn/hmn/cinera/start.sh
 ExecStop=/home/hmn/hmn/cinera/stop.sh
 PIDFile=/home/hmn/hmn/cinera/data/cinera.pid
 Restart=always
-OnFailure=status-email@%n.service
+ExecStopPost=status-email@%n.service
 
 [Install]
 WantedBy=multi-user.target
diff --git a/server/hmn.service b/server/hmn.service
index 50ad401e..d36e7783 100644
--- a/server/hmn.service
+++ b/server/hmn.service
@@ -8,7 +8,7 @@ Group=hmn
 ExecStart=/home/hmn/bin/hmn
 Restart=always
 TimeoutStopSec=15
-OnFailure=status-email@%n.service
+ExecStopPost=status-email@%n.service
 
 [Install]
 WantedBy=multi-user.target