From 154c50f15d20dcfc23ff9c48b7a1ab6dd053fca9 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Wed, 25 Jul 2018 11:00:20 -0500
Subject: [PATCH] Add a -maintainers alias file.

The current scripting generates aliases of the form
foo-owner@fedoraproject.org.  But this conflicts with our messaging
which says that the project "owns" packages and people "maintain" them.
Plus, "owner" is singular while we really want to have more than one
maintainer.

This simply adds a second alias file generated from the original file.
---
 roles/base/files/postfix/main.cf/main.cf.gateway    |  2 +-
 roles/packager_alias/files/package-owner-aliases.sh | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/roles/base/files/postfix/main.cf/main.cf.gateway b/roles/base/files/postfix/main.cf/main.cf.gateway
index c86e5b9c7..de5284a1b 100644
--- a/roles/base/files/postfix/main.cf/main.cf.gateway
+++ b/roles/base/files/postfix/main.cf/main.cf.gateway
@@ -399,7 +399,7 @@ relay_domains = $mydestination fedora.phx.redhat.com
 #
 #alias_maps = dbm:/etc/aliases
 alias_maps = hash:/etc/aliases
-alias_maps = hash:/etc/aliases, hash:/etc/postfix/package-owner
+alias_maps = hash:/etc/aliases, hash:/etc/postfix/package-owner, hash:/etc/postfix/package-maintainers
 #alias_maps = hash:/etc/aliases, nis:mail.aliases
 #alias_maps = netinfo:/aliases
 
diff --git a/roles/packager_alias/files/package-owner-aliases.sh b/roles/packager_alias/files/package-owner-aliases.sh
index b96467242..9c62527bf 100755
--- a/roles/packager_alias/files/package-owner-aliases.sh
+++ b/roles/packager_alias/files/package-owner-aliases.sh
@@ -1,15 +1,25 @@
 #!/bin/bash
 
 output=`mktemp`
+moutput=`mktemp`
 dest=/etc/postfix/package-owner
+mdest=/etc/postfix/package-maintainers
 /usr/local/bin/owner-email.py >> $output
 if [ $? != 0 ]; then
    echo "error creating owner-alias file" >&2
    exit 1
 fi
 
+sed -e 's/-owner: /-maintainers: /' $output > $moutput
+
 cp $output $dest
 chmod +r $output
 mv $output $dest
 /usr/sbin/restorecon /etc/postfix/package-owner
 /usr/sbin/postalias /etc/postfix/package-owner
+
+cp $moutput $mdest
+chmod +r $moutput
+mv $moutput $mdest
+/usr/sbin/restorecon /etc/postfix/package-maintainers
+/usr/sbin/postalias /etc/postfix/package-maintainers
-- 
2.17.1