use long option names for clarity

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index 8fa4c833bd9915c15dcd8b9b6ac9331d60b87c0d..4d3a1882b610e894985f121bfcf01b90391de6c7 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -27,18 +27,18 @@ DELIVER="$NICE /usr/lib/dovecot/deliver"
 
 CRM114="$NICE /usr/share/crm114/mailreaver.crm -u $MAILFILT/crm114/"
 SA_PREFS="$MAILFILT/spamassassin/user_prefs"
 
 CRM114="$NICE /usr/share/crm114/mailreaver.crm -u $MAILFILT/crm114/"
 SA_PREFS="$MAILFILT/spamassassin/user_prefs"

-SPAMASSASSIN="$NICE /usr/bin/spamassassin -p $SA_PREFS"
-SPAMC="$NICE /usr/bin/spamc -lx"
+SPAMASSASSIN="$NICE /usr/bin/spamassassin --prefs-file=$SA_PREFS"
+SPAMC="$NICE /usr/bin/spamc --log-to-stderr --no-safe-fallback"

 #SPAMC="$SPAMASSASSIN"
 TRAINER="$MAILFILT/bin/train"
 
 OURDATE=`date -R`
 #SPAMC="$SPAMASSASSIN"
 TRAINER="$MAILFILT/bin/train"
 
 OURDATE=`date -R`

-OURDATE_SHORT=`date +%Y.%m.%d.%H.%m.%N`
+OURDATE_SHORT=`date +%Y.%m.%d.%H.%M.%N`

 
 

-INBOX=$HOME/.maildir
+BASE=$HOME/.maildir

 
 #DEFAULT="|$DELIVER"
 
 #DEFAULT="|$DELIVER"

-DEFAULT=$INBOX/
+DEFAULT=$BASE/

 ORGMAIL=$HOME/BOUNCED-MAIL
 
 # maximum message size for spam checking
 ORGMAIL=$HOME/BOUNCED-MAIL
 
 # maximum message size for spam checking


@@ -68,8 +68,8 @@ RE_LASTNAME="kraff?t"
 RE_EXTRACT_HEADER_VALUE="[     ]*\/[^  ].*"
 
 NULL=/dev/null
 RE_EXTRACT_HEADER_VALUE="[     ]*\/[^  ].*"
 
 NULL=/dev/null

-DISCARD=$INBOX/.discard/
-#DISCARD="'|$DELIVER -m INBOX.discard'"
+DISCARD=$BASE/.discard/
+#DISCARD="'|$DELIVER -m BASE.discard'"

 
 ### variables from the message
 
 
 ### variables from the message