Server: Use "postmaster" as default --from-email address rather than "unknown@server".

2 files changed, 8 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 4a5f90f..d67d173 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+debug-me (1.20170506) UNRELEASED; urgency=medium
+
+  * Server: Use "postmaster" as default --from-email address
+    rather than "unknown@server".
+
+ -- Joey Hess <id@joeyh.name>  Tue, 09 May 2017 11:45:41 -0400
+
 debug-me (1.20170505) unstable; urgency=medium
 
   * First release of debug-me.
diff --git a/Server.hs b/Server.hs
index d7a43a0..ce4242c 100644
--- a/Server.hs
+++ b/Server.hs
@@ -262,7 +262,7 @@ emailSessionLog email o logfile
 	| otherwise = return ()
   where
 	to = Address Nothing email
-	from = Address Nothing $ fromMaybe "unknown@server" (serverEmail o)
+	from = Address Nothing $ fromMaybe "postmaster" (serverEmail o)
 	subject = "Your recent debug-me session"
 	body = "Attached is the log from your recent debug-me session."
 	isemail = "@" `T.isInfixOf` email