Mailfilter: Updated SRCF rules

diff --git a/mailfiter b/mailfiter
index 1f9f54b590e6f08e41fc587c4965d008d712496f..ef2edfc50519f0a89a4b47ec8250c0c272f09dec 100644 (file)
--- a/mailfiter
+++ b/mailfiter
@@ -757,14 +757,19 @@ if ( hasaddr("soc-sparrow@lists.cam.ac.uk") )
        to "Maildir/.Societies.Sparrowism"
 }
 
-if ( hasaddr("srcf+logs@hermes.cam.ac.uk") )
+if ( hasaddr("executive@srcf.net") )
 {
-       to "Maildir/.Societies.SRCF.Sysadmin.Archive.Logs"
+       to "Maildir/.Societies.SRCF.Executive"
 }
 
-if ( hasaddr("logcheck@srcf.net") )
+if ( hasaddr("webmaster@srcf.ucam.org") )
 {
-       to "Maildir/.Societies.SRCF.Sysadmin.Archive.Logs"
+       to "Maildir/.Societies.SRCF.Website"
+}
+
+if ( hasaddr("webmaster@srcf.net") )
+{
+       to "Maildir/.Societies.SRCF.Website"
 }
 
 if (/^List-Id: SRCF admin <soc-srcf-admin\.lists\.cam\.ac\.uk>/)
@@ -789,27 +794,42 @@ if ( hasaddr("soc-srcf-social@lists.cam.ac.uk") )
        to "Maildir/.Societies.SRCF"
 }
 
+if ( hasaddr("soc-srcf@lists.cam.ac.uk") )
+{
+       to "Maildir/.Societies.SRCF"
+}
+
 if ( hasaddr("soc-srcf-users@lists.cam.ac.uk") )
 {
        to "Maildir/.Societies.SRCF"
 }
 
-if(/^From: soc-srcf-social-owner@lists.cam.ac.uk/)
+if(/^From: soc-srcf-social-[a-z]*@lists.cam.ac.uk/)
+{
+       to "Maildir/.Societies.SRCF.List Admin"
+}
+
+if(/^From: soc-srcf-support-[a-z]*@lists.cam.ac.uk/)
+{
+       to "Maildir/.Societies.SRCF.List Admin"
+}
+
+if(/^From: soc-srcf-maintenance-[a-z]*@lists.cam.ac.uk/)
 {
        to "Maildir/.Societies.SRCF.List Admin"
 }
 
-if(/^From: soc-srcf-support-owner@lists.cam.ac.uk/)
+if( hasaddr("soc-srcf-social-owner@lists.cam.ac.uk") )
 {
        to "Maildir/.Societies.SRCF.List Admin"
 }
 
-if(/^From: soc-srcf-maintenance-request@lists.cam.ac.uk/)
+if( hasaddr("soc-srcf-maintenance-owner@lists.cam.ac.uk") )
 {
        to "Maildir/.Societies.SRCF.List Admin"
 }
 
-if (/^List-Id: .* <soc-srcf\.lists\.cam\.ac\.uk>/)
+if( hasaddr("soc-srcf-owner@lists.cam.ac.uk") )
 {
        to "Maildir/.Societies.SRCF.List Admin"
 }