X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/39624250646933161646aa1de574cfc4965f2916..42a5256de2c5182ddcece78d3da54ea91cfbf088:/procmail/procmailrc diff --git a/procmail/procmailrc b/procmail/procmailrc index 35dbd26..4403725 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 @@ -50,8 +17,12 @@ INCLUDERC=$PMDIR/smsmail #VERBOSE=yes INCLUDERC=$PMDIR/logging +INCLUDERC=$PMDIR/msgid-index + +INCLUDERC=$PMDIR/flag-test-messages INCLUDERC=$PMDIR/dejavu +INCLUDERC=$PMDIR/cleanup INCLUDERC=$PMDIR/eqdomains INCLUDERC=$PMDIR/duplicates @@ -60,14 +31,25 @@ INCLUDERC=$PMDIR/to-gmail INCLUDERC=$PMDIR/justme -INCLUDERC=$PMDIR/spamtraps -INCLUDERC=$PMDIR/spammers INCLUDERC=$PMDIR/spamfilter +INCLUDERC=$PMDIR/handlespam + #INCLUDERC=$PMDIR/autoreplies -INCLUDERC=$PMDIR/addheaders +INCLUDERC=$PMDIR/tickle -INCLUDERC=$PMDIR/lurker +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 + +INCLUDERC=$PMDIR/deliver