X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/38207b0c0e50475d745e937b085da41c7260006d..921c725fd50d116ea75126e150de7933d3976bd9:/procmail/procmailrc

diff --git a/procmail/procmailrc b/procmail/procmailrc
index 9b66cee..117f552 100755
--- a/procmail/procmailrc
+++ b/procmail/procmailrc
@@ -8,50 +8,21 @@ 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
 
+#VERBOSE=yes
+
+INCLUDERC=$PMDIR/logging
+#INCLUDERC=$PMDIR/msgid-index
+
 INCLUDERC=$PMDIR/ignore
 
 INCLUDERC=$PMDIR/smsmail
 
-#VERBOSE=yes
-
-INCLUDERC=$PMDIR/logging
+INCLUDERC=$PMDIR/flag-test-messages
 
 INCLUDERC=$PMDIR/dejavu
+INCLUDERC=$PMDIR/cleanup
 INCLUDERC=$PMDIR/eqdomains
 
 INCLUDERC=$PMDIR/duplicates
@@ -60,16 +31,25 @@ INCLUDERC=$PMDIR/to-gmail
 
 INCLUDERC=$PMDIR/justme
 
-INCLUDERC=$PMDIR/spamtraps
-INCLUDERC=$PMDIR/spammers
 INCLUDERC=$PMDIR/spamfilter
 
-INCLUDERC=$PMDIR/addheaders
-
 INCLUDERC=$PMDIR/handlespam
 
 #INCLUDERC=$PMDIR/autoreplies
 
-INCLUDERC=$PMDIR/lurker
+INCLUDERC=$PMDIR/tickle
+
+INCLUDERC=$PMDIR/listquirks
 
 INCLUDERC=$PMRULES/all
+
+INCLUDERC=$PMDIR/addheaders
+
+#INCLUDERC=$PMDIR/lurker
+INCLUDERC=$PMDIR/spool
+
+#TODO: only spool after delayed delivery
+
+INCLUDERC=$PMDIR/delay-delivery
+
+SWITCHRC=$PMDIR/deliver