Browse Source

Update MUA config:
- Remove crm114 usage
- Add some mailboxes

Emmanuel Bouthenot 14 years ago
parent
commit
091b440bc1
3 changed files with 12 additions and 10 deletions
  1. 7 8
      .mailfilter
  2. 3 2
      .mutt/conf/macros
  3. 2 0
      .mutt/conf/mailboxes

+ 7 - 8
.mailfilter

@@ -136,14 +136,14 @@ if (/^From:.*logcheck@/ || /^Subject:.*rkhunter/ || /^Subject:.*Logwatch for/ ||
     to $MAILDIR/.logs
 }
 
-### Spam
+### AntiSpam
 
-CRMSCORE=`grep -a -v "^X-CRM114" | crm -u $HOME/.crm/ /usr/share/crm114/mailfilter.crm --stats_only`
-xfilter "formail -I \"X-CRM114-Score: $CRMSCORE\""
-if ($CRMSCORE < -1)
-{
-    xfilter "formail -I \"X-CRM114-Spam: yes\""
-}
+#CRMSCORE=`grep -a -v "^X-CRM114" | crm -u $HOME/.crm/ /usr/share/crm114/mailfilter.crm --stats_only`
+#xfilter "formail -I \"X-CRM114-Score: $CRMSCORE\""
+#if ($CRMSCORE < -1)
+#{
+#    xfilter "formail -I \"X-CRM114-Spam: yes\""
+#}
 
 #log "Spam: $CRMSCORE"
 #if (/^X-CRM114-Spam: yes/)
@@ -151,7 +151,6 @@ if ($CRMSCORE < -1)
 #    to $MAILDIR/.Spam
 #}
 
-
 #xfilter "spamc"
 if (/^X-Spam-Status: YES/)
 {

+ 3 - 2
.mutt/conf/macros

@@ -26,5 +26,6 @@ macro index \cx "<tag-pattern>~N<enter><tag-prefix><toggle-new><tag-prefix><clea
 #macro index,pager \ch "<enter-command>unset wait_key<enter><pipe-message>sa-learn --forget<enter><pipe-message>sa-learn --ham --no-sync<enter><enter-command>set wait_key<enter>"	"Set message as HAM"
 #macro index,pager \cs "<enter-command>unset wait_key<enter><bounce-message>spam@kaoru<enter><enter-command>set wait_key<enter><save-message>=.Spam<enter>" "Set message as SPAM"
 
-macro index,pager \eh "<enter-command>unset wait_key<enter><pipe-message>crmlearn --learnnonspam<enter><enter-command>set wait_key<enter>" "Set message as HAM via CRM114"
-macro index,pager \es "<enter-command>unset wait_key<enter><pipe-message>crmlearn --learnspam<enter><enter-command>set wait_key<enter><save-message>=.Spam<enter>" "Set message as SPAM via CRM114"
+# crm114 macros
+#macro index,pager \eh "<enter-command>unset wait_key<enter><pipe-message>crmlearn --learnnonspam<enter><enter-command>set wait_key<enter>" "Set message as HAM via CRM114"
+#macro index,pager \es "<enter-command>unset wait_key<enter><pipe-message>crmlearn --learnspam<enter><enter-command>set wait_key<enter><save-message>=.Spam<enter>" "Set message as SPAM via CRM114"

+ 2 - 0
.mutt/conf/mailboxes

@@ -48,6 +48,7 @@ mailboxes +.rmll.10.logistique
 mailboxes +.rmll.10.communication
 mailboxes +.rmll.10.isic
 mailboxes +.rmll.10.finance
+mailboxes +.rmll.10.compta
 mailboxes +.rmll.10.invitation
 mailboxes +.rmll.10.notif
 mailboxes +.rmll.10.audiovideo
@@ -55,6 +56,7 @@ mailboxes +.rmll.10.themes
 mailboxes +.rmll.10.sessions
 mailboxes +.rmll.10.internet
 mailboxes +.rmll.10.village
+mailboxes +.rmll.10.benevoles
 
 mailboxes +.debian
 mailboxes +.debian.misc