Improve SRCF rules

diff --git a/mailfiter b/mailfiter
index 81299d12ee54d98ed9671c0a27ceb40a039048c7..e8a7b3d78ef2f3716d6c71627c2a443539b9fdaf 100644 (file)
--- a/mailfiter
+++ b/mailfiter
@@ -622,16 +622,48 @@ if ( hasaddr("soc-sparrow@lists.cam.ac.uk") )
        to "Maildir/.Societies.Sparrowism"
 }
 
-if (/List-Id: SRCF admin <soc-srcf-admin\.lists\.cam\.ac\.uk>/)
+if ( hasaddr("srcf+logs@hermes.cam.ac.uk") )
 {
+       to "Maildir/.Societies.SRCF.Sysadmin.Archive.Logs"
+}
+
+if ( hasaddr("logcheck@srcf.net") )
+{
+       to "Maildir/.Societies.SRCF.Sysadmin.Archive.Logs"
+}
+
+if (/^List-Id: SRCF admin <soc-srcf-admin\.lists\.cam\.ac\.uk>/)
+{
+       if (/^Subject:.*Cron <[^@<>]+@[^@<>]+>.*/)
+       {
+
+               to "Maildir/.Societies.SRCF.Sysadmin.Archive.Logs"
+
+       }
+
        to "Maildir/.Societies.SRCF.Sysadmin.Archive"
 }
 
+if ( hasaddr("soc-srcf-maintenance@lists.cam.ac.uk") )
+{
+       to "Maildir/.Societies.SRCF"
+}
+
+if ( hasaddr("soc-srcf-social@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/)
+{
+       to "Maildir/.Societies.SRCF.List Admin"
+}
+
 if(/^From: soc-srcf-support-owner@lists.cam.ac.uk/)
 {
        to "Maildir/.Societies.SRCF.List Admin"
@@ -688,6 +720,16 @@ if ( hasaddr("soc-srcf-admin@lists.cam.ac.uk") )
        to "Maildir/.Societies.SRCF.Sysadmin"
 }
 
+if ( hasaddr("srcf-web-admins@srcf.net") )
+{
+       to "Maildir/.Societies.SRCF.Sysadmin"
+}
+
+if ( hasaddr("executive-admins@srcf.net") )
+{
+       to "Maildir/.Societies.SRCF.Sysadmin"
+}
+
 if (/List-Id: .* <soc-cuer-pr\.lists\.cam\.ac\.uk>/)
 {
        to "Maildir/.Societies.CUER"