let ignore handle unwanted ul mails

diff --git a/config/ignore b/config/ignore
index 06332e132c40167242984ebdea3a8468a1e9c67b..0bf894885738b0f5afa266ee106082b737daf835 100644 (file)
--- a/config/ignore
+++ b/config/ignore
@@ -7,3 +7,16 @@
 ^Subject: New Spam - (Explicit|Suspect) Summary Digest: [[:digit:]]+ Messages$
 ^Subject: [^[:space:]]+ (mailing list memberships reminder|Mitgliedschafts-Erinnerung)$
 ^Subject: =\?[-[:alnum:]]+\?q\?.+_Mitgliedschafts-Erinnerung\?=$
 ^Subject: New Spam - (Explicit|Suspect) Summary Digest: [[:digit:]]+ Messages$
 ^Subject: [^[:space:]]+ (mailing list memberships reminder|Mitgliedschafts-Erinnerung)$
 ^Subject: =\?[-[:alnum:]]+\?q\?.+_Mitgliedschafts-Erinnerung\?=$

+^(To|Cc):.*\<Events@(st(affmail|udents)\.)?ul\.ie\>
+^(To|Cc):.*\<Bereavements@(st(affmail|udents)\.)?ul\.ie\>
+^(To|Cc):.*\<Timetables@(st(affmail|udents)\.)?ul\.ie\>
+^(To|Cc):.*\<(HR|BE|PO|HnS)Notices@(st(affmail|udents)\.)?ul\.ie\>
+^(To|Cc):.*\<ITD(ChangeControlNotification|Notices)@(st(affmail|udents)\.)?ul\.ie\>
+^(To|Cc):.*\<Opinions@(st(affmail|udents)\.)?ul\.ie\>
+^(To|Cc):.*\<AllStaff@(st(affmail|udents)\.)?ul\.ie\>
+^(To|Cc):.*\<ResearchPostgraduates@(st(affmail|udents)\.)?ul\.ie\>
+^(To|Cc):.*\<NewsandOther@(st(affmail|udents)\.)?ul\.ie\>
+^(To|Cc):.*\<SportsNews@(st(affmail|udents)\.)?ul\.ie\>
+^(To|Cc):.*\<ForSaleorWanted@(st(affmail|udents)\.)?ul\.ie\>
+^(To|Cc):.*\<ResearchInformationRISS@(st(affmail|udents)\.)?ul\.ie\>
+^(To|Cc):.*\<SecurityGroupFacultyandResearchers@(st(affmail|udents)\.)?ul\.ie\>

diff --git a/procmail/rules/ul b/procmail/rules/ul
index a6162e410540ec723868cb23d34b8def81de5de1..353913815c93dfb71ff0748dcbe562bcb358747d 100644 (file)
--- a/procmail/rules/ul
+++ b/procmail/rules/ul
@@ -1,30 +1,6 @@
 :0
 * ORIGINAL_TO ?? ^martin\.krafft=ul\.ie@forward\.madduck\.net$
 :0
 * ORIGINAL_TO ?? ^martin\.krafft=ul\.ie@forward\.madduck\.net$

-{
-  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|HnS)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"
-    SWITCHRC=$PMDIR/discard
-  }
-  RE_UL_DOMAIN
-
-  DEST=ul
-}
+DEST=ul

 
 :0
 * ORIGINAL_TO ?? ^academic-debian@lists\.madduck\.net@mass\.madduck\.net$
 
 :0
 * ORIGINAL_TO ?? ^academic-debian@lists\.madduck\.net@mass\.madduck\.net$