Improve healthcheck

caddy/config/Caddyfile

@@ -2,11 +2,6 @@
 	email tobias@msrg.cc
 }
 
-db.serguzim.me:80,
-dns.serguzim.me:80 {
-	reverse_proxy host.docker.internal:4444
-}
-
 import /etc/caddy/snippets
 import /etc/caddy/conf.d/*.conf
 import /etc/caddy/conf-hidden.d/*.conf

healthcheck/.gitignore

@@ -1,2 +0,0 @@
-/mailcheck.mail
-/msmtprc

healthcheck/data/http

@@ -41,7 +41,7 @@ check_url "www.reitanlage-oranienburg.de"
 
 if [ "$error" = "" ]
 then
-    curl_hc "$hc_url" >/dev/null 2>&1
+    curl_hc "$hc_url"
 else
-	curl_hc --data-raw "$error" "$hc_url/fail" >/dev/null 2>&1
+	curl_hc --data-raw "$error" "$hc_url/fail"
 fi

healthcheck/data/mail

@@ -0,0 +1,9 @@
+#!/usr/bin/sh
+
+set -e
+cd /opt/ || exit
+
+envsubst < template.msmtprc > /tmp/msmtprc
+envsubst < mailcheck.template.mail > /tmp/mailcheck.mail
+
+msmtp -C /tmp/msmtprc -a default "$MAIL_HC_UID@hc-ping.com" < /tmp/mailcheck.mail

healthcheck/docker-compose.yml

@@ -10,7 +10,7 @@ x-common-elements:
     - .env
     - .secret.env
   volumes:
-    - ./:/opt
+    - ./data/:/opt
 
 services:
   http:

healthcheck/healthcheck@.service

@@ -0,0 +1,4 @@
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/docker compose run --rm %i
+WorkingDirectory=/opt/services/healthcheck/

healthcheck/healthcheck@.timer

@@ -0,0 +1,4 @@
+[Timer]
+OnCalendar=*:0/5
+[Install]
+WantedBy=timers.target

healthcheck/mail

@@ -1,9 +0,0 @@
-#!/usr/bin/sh
-
-set -e
-cd /opt/ || exit
-
-envsubst < template.msmtprc > msmtprc
-envsubst < mailcheck.template.mail > mailcheck.mail
-
-msmtp -C /opt/msmtprc -a default "$MAIL_HC_UID@hc-ping.com" < /opt/mailcheck.mail