From 46492ae750da5c6ec3a93ef887b77fe0b2704282 Mon Sep 17 00:00:00 2001
From: Ivan Dimitrov <ivan@idimitrov.dev>
Date: Thu, 9 Nov 2023 12:24:10 +0200
Subject: [PATCH] test-mail script fixes

---
 bin/test-mail          | 16 +++++++++-------
 mailserver/default.nix |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/bin/test-mail b/bin/test-mail
index 02cb688..dc2f341 100755
--- a/bin/test-mail
+++ b/bin/test-mail
@@ -1,6 +1,13 @@
 #!/usr/bin/env bash
 
-mail="
+
+name="Ivan Dimitrov"
+from="ivan@idimitrov.dev"
+rand="$(tr -dc A-Za-z0-9 </dev/urandom | head -c 13 ; echo '')"
+to="test-$rand@srv1.mail-tester.com"
+
+mail="From: $from
+To: $to
 Subject: Invitation to Our Upcoming Tech Symposium
 
 List-Unsubscribe: <mailto:unsubscribe@example.com>
@@ -32,12 +39,7 @@ jane.smith@example.com
 P.S. If you wish to stop receiving these emails, you can unsubscribe by replying with 'UNSUBSCRIBE' in the subject line.
 "
 
-name="Ivan Dimitrov"
-from="ivan@idimitrov.dev"
-rand="$(tr -dc A-Za-z0-9 </dev/urandom | head -c 13 ; echo '')"
-to="test-$rand.srv1.mail-tester.com"
-
-sendmail -F "$name" -f "$from" "$to" < "$mail"
+echo "$mail" | sendmail -t -F "$name" -f "$from"
 
 echo "https://mail-tester.com/test-$rand"
 
diff --git a/mailserver/default.nix b/mailserver/default.nix
index aeee22e..32f94d9 100644
--- a/mailserver/default.nix
+++ b/mailserver/default.nix
@@ -50,6 +50,6 @@
   };
 
   environment = {
-    systemPackages = with pkgs; [ coreutils-full fd git vim mlocate busybox bash ];
+    systemPackages = with pkgs; [ coreutils-full fd git vim mlocate busybox bash scripts ];
   };
 }