From 0e3e68dace9edbaffbd18d57a34caa26b0d1ba4e Mon Sep 17 00:00:00 2001
From: myve <forge@myve.lan>
Date: Wed, 5 Mar 2025 03:33:23 +0000
Subject: [PATCH] Re-instated reject mail logger

---
 build/run/docker-entrypoint/entrypoint.sh        |  2 +-
 build/run/docker-entrypoint/init.d/30-postfix.sh |  4 ++--
 build/run/docker-entrypoint/init.d/70-reject.sh  | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100755 build/run/docker-entrypoint/init.d/70-reject.sh

diff --git a/build/run/docker-entrypoint/entrypoint.sh b/build/run/docker-entrypoint/entrypoint.sh
index 46e8d1a..8a70403 100755
--- a/build/run/docker-entrypoint/entrypoint.sh
+++ b/build/run/docker-entrypoint/entrypoint.sh
@@ -29,7 +29,7 @@ do
 		touch ${log}
 	fi
 done
-syslogd -O /var/log/mail/maillog -s 2000000 -b 10
+syslogd -O /var/log/mail/maillog -s ${MYVEMAIL_LOG_SIZE:-2000000} -b 10
 
 # Run all scripts in init folder
 for file in /docker-entrypoint/init.d/*.sh
diff --git a/build/run/docker-entrypoint/init.d/30-postfix.sh b/build/run/docker-entrypoint/init.d/30-postfix.sh
index 1a685b6..3f90021 100755
--- a/build/run/docker-entrypoint/init.d/30-postfix.sh
+++ b/build/run/docker-entrypoint/init.d/30-postfix.sh
@@ -35,7 +35,7 @@ addmx=(${MYVEMAIL_DOMAIN})
 addmx+=(${MYVEMAIL_ADDMX//,/ })
 echo -n | tee /etc/postfix/{helo_access,{whitelisted,blacklisted}_{domains,emails}} >/dev/null
 
-echo "/\.outbound\.protection\.outlook\.com$/			OK Outlook services" >/etc/postfix/helo_access
+# echo "/\.outbound\.protection\.outlook\.com$/			OK Outlook services" >/etc/postfix/helo_access
 
 for domain in ${addmx[@]}
 do
@@ -106,4 +106,4 @@ postmap /etc/postfix/helo_access \
     /etc/postfix/smtp_header_checks /etc/postfix/header_checks \
     /etc/postfix/body_checks \
     /etc/postfix/postscreen_access.cidr \
-    /etc/postfix/{whitelisted,blacklisted}_{domains,emails}
\ No newline at end of file
+    /etc/postfix/{whitelisted,blacklisted}_{domains,emails}
diff --git a/build/run/docker-entrypoint/init.d/70-reject.sh b/build/run/docker-entrypoint/init.d/70-reject.sh
new file mode 100755
index 0000000..9afaa83
--- /dev/null
+++ b/build/run/docker-entrypoint/init.d/70-reject.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# Notify if rejected emails were found
+while true
+do
+	bash -c 'tail -n +0 --pid=$$ -f /var/log/mail/maillog* | grep --line-buffered -F -v -f /var/log/mail/reject.log | { sed "/NOQUEUE: reject/q" && kill $$ ;}'
+	grep -h "NOQUEUE: reject" /var/log/mail/maillog* | grep -F -v -f /var/log/mail/reject.log >>/var/log/mail/reject.log
+	cat <<- mail | sendmail reject@${MYVEMAIL_DOMAIN}
+	From: reject@${MYVEMAIL_DOMAIN}
+	To: reject@${MYVEMAIL_DOMAIN}
+	Subject: Rejected email found
+
+	$(tail -n 1 /var/log/mail/reject.log)
+	mail
+done &