fix newline in admin log message

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index 7df70cd0996212dc0dd61cd8df74baf67a69a02a..93efda83ccdbc2689f7f65380b6534eb5e0ff6c3 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -17,6 +17,8 @@ REPLIES=$MAILFILT/autoreplies
 LOGFILE=${LOGFILE:-$PMVAR/log}
 LOGABSTRACT=no
 
 LOGFILE=${LOGFILE:-$PMVAR/log}
 LOGABSTRACT=no
 

+LC_CTYPE=de_CH.UTF-8
+

 #NICE='/usr/bin/nice -20'
 
 PROCMAIL="$NICE /usr/bin/procmail -p $PMDIR/procmailrc"
 #NICE='/usr/bin/nice -20'
 
 PROCMAIL="$NICE /usr/bin/procmail -p $PMDIR/procmailrc"


@@ -42,7 +44,7 @@ DEFAULT=$BASE/
 ORGMAIL=$HOME/BOUNCED-MAIL
 
 # maximum message size for spam checking
 ORGMAIL=$HOME/BOUNCED-MAIL
 
 # maximum message size for spam checking

-SPAMCHECK_MAX_MESSAGE_SIZE=2500000
+SPAMCHECK_MAX_MESSAGE_SIZE=512000

 
 # if crm114 is unsure and SA returns a score less-than-or-equal to this,
 # autotrain crm114 with ham
 
 # if crm114 is unsure and SA returns a score less-than-or-equal to this,
 # autotrain crm114 with ham


@@ -67,6 +69,8 @@ RE_FIRSTNAME="martin($RE_SPACE_NEWLINE+f(\.?|elix))?"
 RE_LASTNAME="kraff?t"
 RE_EXTRACT_HEADER_VALUE="[     ]*\/[^  ].*"
 
 RE_LASTNAME="kraff?t"
 RE_EXTRACT_HEADER_VALUE="[     ]*\/[^  ].*"
 

+DEJAVU_HEADER=X-Deja-Vu
+

 NULL=/dev/null
 DISCARD=$BASE/.discard/
 #DISCARD="'|$DELIVER -m BASE.discard'"
 NULL=/dev/null
 DISCARD=$BASE/.discard/
 #DISCARD="'|$DELIVER -m BASE.discard'"


@@ -109,11 +113,6 @@ INCLUDERC=$PMDIR/get-msgid
 *$ ^Subject:$RE_EXTRACT_HEADER_VALUE
 { SUBJECT="$MATCH" }
 
 *$ ^Subject:$RE_EXTRACT_HEADER_VALUE
 { SUBJECT="$MATCH" }
 

-# TODO: can be removed as soon as albatross is out of the loop
-:0 fw
-* ^X-Original-To-Saved: \/.*
-|$FORMAIL -R X-Original-To-Saved X-Original-To
-

 :0
 *$ ^X-Original-To:$RE_EXTRACT_HEADER_VALUE
 { ORIGINAL_TO="$MATCH" }
 :0
 *$ ^X-Original-To:$RE_EXTRACT_HEADER_VALUE
 { ORIGINAL_TO="$MATCH" }


@@ -139,6 +138,11 @@ INCLUDERC=$PMDIR/normalise
 # to the X-Been-There header).
 MSG_DEJAVU=!
 
 # to the X-Been-There header).
 MSG_DEJAVU=!
 

+# DEST
+# set this to a folder if the message should be delivered elsewhere than the
+# default
+DEST
+

 # SKIP_SPAMCHECKS
 # if set, cuases spamchecks to be skipped, value lists reason
 SKIP_SPAMCHECKS
 # SKIP_SPAMCHECKS
 # if set, cuases spamchecks to be skipped, value lists reason
 SKIP_SPAMCHECKS


@@ -175,3 +179,7 @@ RETRAIN
 # JUSTME
 # if set, contains reason why justme message was passed
 JUSTME
 # JUSTME
 # if set, contains reason why justme message was passed
 JUSTME

+
+# TRAINED_AS
+# if set, contains category with which this message has just been trained
+TRAINED_AS