X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/36d201d5d8ef8260f9b04ae88fa08e83fe726ac5..9dfdf8530a9bd5a53ba991c81926ad7c10f60f05:/procmail/rules/ul

diff --git a/procmail/rules/ul b/procmail/rules/ul
index cbbac48..fbcacdd 100644
--- a/procmail/rules/ul
+++ b/procmail/rules/ul
@@ -1,38 +1,23 @@
 :0
 * ORIGINAL_TO ?? ^martin\.krafft=ul\.ie@forward\.madduck\.net$
 {
-  RE_UL_DOMAIN='(staffmail\.)?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
-  *  -1000 ^0 JUSTME ?? .
-  {
-    LOG="ul:          discard unwanted list mail$NL"
-    SWITCHRC=$PMDIR/discard
-  }
-  RE_UL_DOMAIN
-
   DEST=ul
+  DELAY
 }
 
 :0
-* ORIGINAL_TO ?? ^academic-debian@lists\.madduck\.net@mass\.madduck\.net$
-{ DELAY }
-
-:0
-* ORIGINAL_TO ?? ^(community|discuss)=opensource\.mit\.edu@mass\.madduck\.net$
-{ DELAY }
+* ORIGINAL_TO ?? ^phd(\+.+)?@martin-krafft\.net$
+{
+  DEST=phd
+  DELAY
+}
 
 :0
-* ORIGINAL_TO ?? ^os-renet=insel\.cs\.tu-berlin\.de@mass\.madduck\.net$
+* 1^0 EQ_TO ?? ^academic-debian@lists\.madduck\.net$
+* 1^0 EQ_TO ?? ^(community|discuss)@opensource\.mit\.edu$
+* 1^0 EQ_TO ?? ^os-renet@insel\.cs\.tu-berlin\.de$
+* 1^0 EQ_TO ?? ^iif-discussion@forecasters\.org$
+* 1^0 EQ_TO ?? ^distributions@lists\.freedesktop\.org$
 { DELAY }
 
 # vim:ft=procmail