clean up aliases a bit

roles/fas_client/files/aliases.template

@@ -63,7 +63,6 @@ desktop:	root
 rpcuser:	root
 rpc:		root
 nfsnobody:	root
-notifications:	/dev/null
 
 ingres:		root
 system:		root
@@ -87,6 +86,32 @@ decode:		root
 # Person who should get root's mail
 root:		sysadmin-main
 
+# Mail blackholes for various services
+nobody:               /dev/null
+fedorawiki-noreply:   /dev/null
+extras-orphan:	      /dev/null
+orphan:               /dev/null
+retired-packages:     /dev/null
+control-center-maint: /dev/null
+gecko-bugs-nobody:    /dev/null
+ftbfs:                /dev/null
+trac:                 /dev/null
+taskotron:            /dev/null
+# Fedora Scholarship
+scholarship:          /dev/null
+# Asterisk
+asterisk:             /dev/null
+# Old stuff
+fedoraextras-qa:      /dev/null
+extras-qa:	      /dev/null
+notifications:	      /dev/null
+# Bodhi & pkgdb aliases
+updates:              /dev/null
+pkgdb:                /dev/null
+fudcon-cfp:           /dev/null
+download-logs:        /dev/null
+
+
 # Administrative & Management Aliases
 accounts: sysadmin-main
 admin: sysadmin-main
@@ -94,22 +119,23 @@ s3-mirror: sysadmin-main
 
 hostmaster: admin,sysadmin-dns-members
 sysadmin-main: sysadmin-main-members
+# For vendors to email us
+vendor-support: vendor-support-members
 
+cpe-managers: pfrields@redhat.com,lgriffin@redhat.com,jperrin@redhat.com
+
+
+## Cruft aliases because we used cvs
 cvsextras: scm-commits@lists.fedoraproject.org
 cvsdirsec: 389-commits@lists.fedoraproject.org
 cvseclipse: eclipse-commits@lists.fedoraproject.org
 cvsfont: lohit-devel-list@redhat.com
 cvs-sysadmin: fedora-sysadmin-list@redhat.com
 
-vendor-support: vendor-support-members
 
 # GDK is the human who suggested this redirection
 legal-cla-archive: fedora-lit@redhat.com
 
-# Bodhi & pkgdb aliases
-updates: /dev/null
-pkgdb: /dev/null
-
 vendors: distribution-members
 
 # Fedora Council
@@ -131,18 +157,15 @@ fcaic: bex
 fesco-chair: kevin
 fesco: fesco@lists.fedoraproject.org
 sponsors-feedback: packager-sponsors@fedoraproject.org,fesco@lists.fedoraproject.org
-fedoraextras-qa:	/dev/null
-extras-qa:		/dev/null
 
 # Fedora Hosted Inquiries
-hosted-issues: mmcgrath,lmacken,pfrields,spot
+#hosted-issues: mmcgrath,lmacken,pfrields,spot
 
 # Fedora Mentors
 rave-review: mentors@lists.fedoraproject.org
 
 # FUDCon
 fudcon-register: flock-admin
-fudcon-cfp: /dev/null
 fudcon-paper:    flock-admin
 
 # Fudcon regional aliases - point to point person before that fudcon 
@@ -193,14 +216,13 @@ fas: admin@fedoraproject.org
 server-wg: sgallagh,jperrin,davidstrauss,tuanta,duffy,mitr,simo,johannbg
 
 # Amazon cloud account, ticket #1903
-community-cloud: mattdm@redhat.com,pfrields@redhat.com,jperrin@redhat.com
+community-cloud: mattdm@redhat.com,cpe-managers
 
 # People always confuse things this is a special case
 dgilmore: ausil
 gregdek: gdk
 keys: pnasrat@redhat.com
 relnotes: relnotes-content@lists.fedoraproject.org
-download-logs: /dev/null
 jaboutboul: jack
 kwade: quaid
 stickster: pfrields
@@ -217,21 +239,6 @@ bexelbie: bex
 # Mirror admin alias
 mirror-admin: mirror-admin@lists.fedoraproject.org
 
-# Mail blackholes for various services
-nobody: /dev/null
-fedorawiki-noreply: /dev/null
-extras-orphan:	/dev/null
-retired-packages:	/dev/null
-control-center-maint:	/dev/null
-gecko-bugs-nobody:	/dev/null
-ftbfs: /dev/null
-trac: /dev/null
-taskotron: /dev/null
-
-# Keep these around until 2006-09-01 - they were placed here in exchange 
-# for the slapd.{net,org} domains
-#jhoke: john@hoke.org
-
 # Fedora Marketing and Fedora Ambassadors
 famsco: famsco-members@fedoraproject.org
 fedora-marketing: famsco
@@ -241,6 +248,7 @@ openvideo: tchung
 freemedia: tchung,susmit
 fama: robyduck,nb
 
+
 # Firstname.lastname exceptions (preferrably only for people with a good reason)
 # History: these are people wishing to keep their firstname.lastname email
 # We offered it once but no longer do.  Exceptions should be rare.
@@ -254,12 +262,6 @@ fabian.affolter: fab
 nick.bebout: nb
 dan.mashal: vicodan
 
-# Fedora Scholarship
-scholarship: /dev/null
-
-# Asterisk
-asterisk: admin
-
 # Wiki
 wikiadmin: wikiadmin-members
 
@@ -319,7 +321,6 @@ fedora-kernel-wireless-iwl: sgruszka@redhat.com,linville@redhat.com
 fedora-kernel-wireless-ralink: sgruszka@redhat.com,linville@redhat.com
 fedora-kernel-wireless-realtek: larry.finger@lwfinger.net,jogreene@redhat.com
 
-orphan: extras-orphan@fedoraproject.org
 anaconda-maint: anaconda-maint-list@redhat.com
 xen-maint: xen-maint@redhat.com
 xgl-maint: xgl-maint@redhat.com