X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/26fe4fa08d155002f7e444fd805f2829137fd8f0..3d44894b840daa45d87b12ee8b203f8294eca3df:/procmail/defines diff --git a/procmail/defines b/procmail/defines index af431c1..9503524 100644 --- a/procmail/defines +++ b/procmail/defines @@ -25,6 +25,7 @@ PROCMAIL="$NICE /usr/bin/procmail -p $PMDIR/procmailrc" FORMAIL="$NICE /usr/bin/formail -f" EGREP="$NICE /bin/egrep" SED="$NICE /bin/sed" +BIN_DATE="/bin/date" DELIVER="$NICE /usr/lib/dovecot/deliver" CRM114="$NICE /usr/share/crm114/mailreaver.crm -u $MAILFILT/crm114/" @@ -76,9 +77,13 @@ NULL=/dev/null DELAYED_QUEUE=$BASE/.delayed/ TICKLER_QUEUE=$BASE/.tickler/ DISCARD=$BASE/.discard/ +SPAM=$BASE/.spam/ #DISCARD="'|$DELIVER -m BASE.discard'" -OURDATE="`date +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`" +DELAY_NEXT_WEEKEND='next sunday 28 hours ago' # fri night, 20:00 +DELAY_TONIGHT='tomorrow 00:00 4 hours ago' # tonight at 20:00 + +OURDATE="`$BIN_DATE +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`" :0 *$ OURDATE ?? ^\/${RE_NOT_SPACE}+ { OURDATE_TS="$MATCH" } @@ -86,12 +91,9 @@ OURDATE="`date +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`" *$ OURDATE ?? ^[0-9]+${RE_SPACE}+\/${RE_NOT_SPACE}+ { OURDATE_SHORT="$MATCH" } :0 -*$ OURDATE ?? ^[0-9]+${RE_SPACE}+[0-9.]+${RE_SPACE}+\/${RE_NOT_SPACE}+ +*$ OURDATE ?? ^[0-9]+${RE_SPACE}+[0-9.]+${RE_SPACE}+\/.+ { OURDATE="$MATCH" } -DELAY_NEXT_WEEKEND='next monday 54 hours ago' # fri night, 18:00 CET -DELAY_TONIGHT='tomorrow 00:00 6 hours ago' # tonight at 18:00 CET - ### variables from the message ### local recipient data