From 4f7ff8efd26ae54f7e55780b5f56bbab148929c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Mon, 20 Oct 2014 09:55:21 +0000
Subject: [PATCH] Mailman: ansible group conflict in staging

---
 ...=> main.cf.mailman01.stg.phx2.fedoraproject.org} | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
 rename roles/base/files/postfix/main.cf/{main.cf.mailman-stg => main.cf.mailman01.stg.phx2.fedoraproject.org} (99%)

diff --git a/roles/base/files/postfix/main.cf/main.cf.mailman-stg b/roles/base/files/postfix/main.cf/main.cf.mailman01.stg.phx2.fedoraproject.org
similarity index 99%
rename from roles/base/files/postfix/main.cf/main.cf.mailman-stg
rename to roles/base/files/postfix/main.cf/main.cf.mailman01.stg.phx2.fedoraproject.org
index 2b3291923b..97f4ecec2c 100644
--- a/roles/base/files/postfix/main.cf/main.cf.mailman-stg
+++ b/roles/base/files/postfix/main.cf/main.cf.mailman01.stg.phx2.fedoraproject.org
@@ -93,8 +93,8 @@ mail_owner = postfix
 #myorigin = $myhostname
 #myorigin = $mydomain
 
-mydomain = fedoraproject.org
-myorigin = fedoraproject.org
+mydomain = stg.fedoraproject.org
+myorigin = stg.fedoraproject.org
 
 # RECEIVING MAIL
 
@@ -156,8 +156,7 @@ inet_interfaces = all
 #
 # See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS".
 #
-mydestination = $myhostname, lists.stg.fedoraproject.org,
-                localhost.$mydomain, localhost
+mydestination = $myhostname, localhost.$mydomain, fedora.redhat.com, localhost, lists.stg.fedoraproject.org,
 #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
 #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,
 #	mail.$mydomain, www.$mydomain, ftp.$mydomain
@@ -314,7 +313,7 @@ unknown_local_recipient_reject_code = 550
 #relayhost = [mailserver.isp.tld]
 #relayhost = uucphost
 #relayhost = [an.ip.add.ress]
-relayhost =  bastion.phx2.fedoraproject.org
+relayhost = bastion.phx2.fedoraproject.org
 
 
 # REJECTING UNKNOWN RELAY USERS
@@ -680,12 +679,12 @@ sample_directory = /usr/share/doc/postfix-2.4.5/samples
 #
 readme_directory = /usr/share/doc/postfix-2.4.5/README_FILES
 
+smtp_host_lookup = native,dns
+
 # add this to new postfix to get it to add proper message-id and other 
 # headers to outgoing emails via the gateway. 
 
-
 message_size_limit = 20971520
-#inet_protocols = ipv4
 
 
 # Mailman, see MTA.rst