X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/c04de83de0bf141a8bdfa44b60866dfd50a1e0a6..bda8338eb8f1274f9a1dec73bdb47f80cfe9413f:/procmail/procmailrc

diff --git a/procmail/procmailrc b/procmail/procmailrc
index c30fddb..12a9bdc 100755
--- a/procmail/procmailrc
+++ b/procmail/procmailrc
@@ -8,39 +8,6 @@ PMDIR=$HOME/.etc/mailfilter/procmail
 
 INCLUDERC=$PMDIR/defer
 
-FROM_ALBATROSS=!
-:0
-* ^X-Been-There: madduck@albatross
-{
-  M=$MATCH
-  :0
-  * M ?? ^\+.+\+\/[^@]+
-  {
-    # we have two +, so it's a virtual domain
-    L=$MATCH
-
-    :0
-    * M ?? ^\+\/[^+]+
-    { D=$MATCH }
-
-    OT="$L@$D"
-    L
-    D
-  }
- 
-  :0 E
-  * M ?? ^\/\+?[^@]*
-  { OT="madduck$MATCH@madduck.net" }
-  M
-
-  :0 fw
-  |formail -I "X-Original-To: $OT" -A'X-From-Albatross: yes'
-  OT
-
-  FROM_ALBATROSS
-  LOG="log:     *** received $MSGID from albatross$NL"
-}
-
 INCLUDERC=$PMDIR/defines
 
 INCLUDERC=$PMDIR/ignore
@@ -63,12 +30,17 @@ INCLUDERC=$PMDIR/justme
 INCLUDERC=$PMDIR/spamtraps
 INCLUDERC=$PMDIR/spammers
 INCLUDERC=$PMDIR/spamfilter
+
+INCLUDERC=$PMDIR/addheaders
+
 INCLUDERC=$PMDIR/handlespam
 
 #INCLUDERC=$PMDIR/autoreplies
-
-INCLUDERC=$PMDIR/addheaders
+INCLUDERC=$PMDIR/tickle
 
 INCLUDERC=$PMDIR/lurker
+INCLUDERC=$PMDIR/spool
+
+INCLUDERC=$PMDIR/listquirks
 
 INCLUDERC=$PMRULES/all