From 4f97536f44366b21d97f2bb62588f72df151b599 Mon Sep 17 00:00:00 2001
From: Adam Henry Lewenberg <adamhl@stanford.edu>
Date: Fri, 22 Jun 2018 10:08:58 -0700
Subject: [PATCH] change postfix senders file to use FQDN rather than hostname

---
 NEWS                 | 4 ++++
 manifests/postfix.pp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index cf37e47..3ebd0dc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 unreleased (207x-xx-xx)
 
+    [postfix] Change the sender address for root mail from
+    "root@${::hostname}" to "root@${::fqdn}". This is needed by newer
+    versions of postfix and makes more sense anyway.
+
     [wallet] Make wallet ketyab use the correct path for ktutil.
 
     [duo] Change apt pin file to point to codename rather than archive
diff --git a/manifests/postfix.pp b/manifests/postfix.pp
index 9944860..bd45c66 100644
--- a/manifests/postfix.pp
+++ b/manifests/postfix.pp
@@ -61,7 +61,7 @@ class base::postfix {
 
   # Have mail from root@stanford.edu come from root at the local system
   base::postfix::sender { 'root@stanford.edu':
-    ensure => "root@${::hostname}";
+    ensure => "root@${::fqdn}";
   }
 
   # We used to disable and stop sendmail here on Red Hat, but this doesn't
-- 
GitLab