X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/3d7d576505af2759a6227cec6bef322c688ec3f9..451f66ccde1a608fd45bb8d89db3d7bb1320178e:/procmail/defines diff --git a/procmail/defines b/procmail/defines index af431c1..464cea3 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/" @@ -78,7 +79,10 @@ TICKLER_QUEUE=$BASE/.tickler/ DISCARD=$BASE/.discard/ #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 30 hours ago' # fri night, 18:00 +DELAY_TONIGHT='tomorrow 00:00 6 hours ago' # tonight at 18: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" } @@ -89,9 +93,6 @@ OURDATE="`date +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`" *$ OURDATE ?? ^[0-9]+${RE_SPACE}+[0-9.]+${RE_SPACE}+\/${RE_NOT_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