Fix PBX report headers and checksum status

scripts/pbx-backup-report.sh

@@ -29,11 +29,6 @@ if [[ -z "$REPORT_MAILTO" ]]; then
   exit 0
 fi
 
-if ! command -v mail >/dev/null 2>&1; then
-  echo "mail command is not available" >&2
-  exit 1
-fi
-
 if ! mountpoint -q "$BACKUP_MOUNT"; then
   mount "$BACKUP_MOUNT"
 fi
@@ -109,6 +104,7 @@ REPORT_FROM="$REPORT_FROM" REPORT_MAILTO="$REPORT_MAILTO" SMTP_HOST="$SMTP_HOST"
 import os
 import smtplib
 from email.message import EmailMessage
+from email.utils import formatdate, make_msgid, parseaddr
 
 host = os.environ["SMTP_HOST"]
 port = int(os.environ["SMTP_PORT"])
@@ -124,6 +120,12 @@ msg = EmailMessage()
 msg["Subject"] = subject
 msg["From"] = mail_from
 msg["To"] = mail_to
+msg["Date"] = formatdate(localtime=True)
+_, from_addr = parseaddr(mail_from)
+if "@" in from_addr:
+    msg["Message-ID"] = make_msgid(domain=from_addr.split("@", 1)[1])
+else:
+    msg["Message-ID"] = make_msgid()
 with open(body_path, "r", encoding="utf-8") as f:
     msg.set_content(f.read())
 

scripts/pbx-backup.sh

@@ -118,12 +118,12 @@ tar_if_present "${DEST_DIR}/host-config.tgz" \
   etc/postfix/main.cf
 
 manifest_tmp="$(mktemp)"
+echo "PBX backup finished at $(date -Is)"
+du -sh "$DEST_DIR"
+
 find "$DEST_DIR" -maxdepth 1 -type f ! -name 'manifest.tsv' ! -name 'SHA256SUMS' -printf '%f\t%s\n' | sort > "$manifest_tmp"
 mv "$manifest_tmp" "${DEST_DIR}/manifest.tsv"
 (cd "$DEST_DIR" && sha256sum ./* > SHA256SUMS)
 
 ln -sfn "$DEST_DIR" "${ROOT_DIR}/latest"
 prune_old
-
-echo "PBX backup finished at $(date -Is)"
-du -sh "$DEST_DIR"