From 5aac7d0fad0d3fbf6ee6ea5aaa014d80e2dd803b Mon Sep 17 00:00:00 2001
From: trading-for-ben <benjamin.borbe+trading@gmail.com>
Date: Sun, 22 Feb 2026 16:53:39 +0000
Subject: [PATCH 1/2] Support monit mailserver without authentication

When username/password are empty, use 'without authentication' mode
for direct relay through trusted networks (e.g., VPN).
---
 bundles/monit/files/mailserver.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bundles/monit/files/mailserver.conf b/bundles/monit/files/mailserver.conf
index b214fbf..a10a69f 100644
--- a/bundles/monit/files/mailserver.conf
+++ b/bundles/monit/files/mailserver.conf
@@ -1,4 +1,5 @@
 set alert ${recipient}
+% if username and password:
 set mailserver ${server} port ${port}
 	username "${username}"
 	password "${password}"
@@ -7,4 +8,7 @@ set mailserver ${server} port ${port}
 % endif
 	with timeout 30 seconds
 	using hostname localhost.localdomain
+% else:
+set mailserver ${server} port ${port} without authentication
+% endif
 set mail-format { from: ${sender} }

From 8bf572951e08b83523e63d3cb8b3f6598efdac1b Mon Sep 17 00:00:00 2001
From: trading-for-ben <benjamin.borbe+trading@gmail.com>
Date: Sun, 22 Feb 2026 16:58:56 +0000
Subject: [PATCH 2/2] Support monit mailserver without authentication

Cleaner template structure: common parts outside conditionals.
When username/password are empty, use 'without authentication'.
---
 bundles/monit/files/mailserver.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bundles/monit/files/mailserver.conf b/bundles/monit/files/mailserver.conf
index a10a69f..66dbd2f 100644
--- a/bundles/monit/files/mailserver.conf
+++ b/bundles/monit/files/mailserver.conf
@@ -1,14 +1,14 @@
 set alert ${recipient}
-% if username and password:
 set mailserver ${server} port ${port}
+% if username and password:
 	username "${username}"
 	password "${password}"
+% else:
+	without authentication
+% endif
 % if port == 587:
 	using tlsv1
 % endif
 	with timeout 30 seconds
 	using hostname localhost.localdomain
-% else:
-set mailserver ${server} port ${port} without authentication
-% endif
 set mail-format { from: ${sender} }