improved traps, now db calls log errors

[etc/mailfilter.git] / procmail / rules / ul

diff --git a/procmail/rules/ul b/procmail/rules/ul
index 1d5aaf8a007e33a5c7a05950faf3dc1eb1a9605f..bf9c4dfe86586c6cb9c7ca08382e8e5e4c8b1c7c 100644 (file)
--- a/procmail/rules/ul
+++ b/procmail/rules/ul
@@ -1,22 +1,25 @@
 :0
 * ORIGINAL_TO ?? ^martin\.krafft=ul\.ie@forward\.madduck\.net$
 {
-  RE_UL_DOMAIN='(staffmail\.)?ul\.ie'
+  RE_UL_DOMAIN='(st(affmail|udents)\.)?ul\.ie'
   :0
-  *$ 1^0 ^TO_Events@$RE_UL_DOMAIN
-  *$ 1^0 ^TO_Bereavements@$RE_UL_DOMAIN
-  *$ 1^0 ^TO_Timetables@$RE_UL_DOMAIN
-  *$ 1^0 ^TO_(HR|BE|PO)Notices@$RE_UL_DOMAIN
-  *$ 1^0 ^TO_Opinions@$RE_UL_DOMAIN
-  *$ 1^0 ^TO_AllStaff@$RE_UL_DOMAIN
-  *$ 1^0 ^TO_ResearchPostgraduates@$RE_UL_DOMAIN
-  *$ 1^0 ^TO_NewsandOther@$RE_UL_DOMAIN
-  *$ 1^0 ^TO_ForSaleorWanted@$RE_UL_DOMAIN
-  *$ 1^0 ^TO_ResearchInformationRISS@$RE_UL_DOMAIN
+  *$     1 ^0 ^TO_Events@$RE_UL_DOMAIN
+  *$     1 ^0 ^TO_Bereavements@$RE_UL_DOMAIN
+  *$     1 ^0 ^TO_Timetables@$RE_UL_DOMAIN
+  *$     1 ^0 ^TO_(HR|BE|PO)Notices@$RE_UL_DOMAIN
+  *$     1 ^0 ^TO_ITD(ChangeControlNotification|Notices)@$RE_UL_DOMAIN
+  *$     1 ^0 ^TO_Opinions@$RE_UL_DOMAIN
+  *$     1 ^0 ^TO_AllStaff@$RE_UL_DOMAIN
+  *$     1 ^0 ^TO_ResearchPostgraduates@$RE_UL_DOMAIN
+  *$     1 ^0 ^TO_NewsandOther@$RE_UL_DOMAIN
+  *$     1 ^0 ^TO_SportsNews@$RE_UL_DOMAIN
+  *$     1 ^0 ^TO_ForSaleorWanted@$RE_UL_DOMAIN
+  *$     1 ^0 ^TO_ResearchInformationRISS@$RE_UL_DOMAIN
+  *$     1 ^0 ^TO_SecurityGroupFacultyandResearchers@$RE_UL_DOMAIN
+  *  -1000 ^0 JUSTME ?? .
   {
     LOG="ul:          discard unwanted list mail$NL"
-    :0
-    $DISCARD
+    SWITCHRC=$PMDIR/discard
   }
   RE_UL_DOMAIN
 
@@ -28,9 +31,11 @@
 { DELAY }
 
 :0
-* ORIGINAL_TO ?? ^community=opensource\.mit\.edu@mass\.madduck\.net$
+* ORIGINAL_TO ?? ^(community|discuss)=opensource\.mit\.edu@mass\.madduck\.net$
 { DELAY }
 
-
+:0
+* ORIGINAL_TO ?? ^os-renet=insel\.cs\.tu-berlin\.de@mass\.madduck\.net$
+{ DELAY }
 
 # vim:ft=procmail