Browse Source

Update maildrop config, mutt config, fixes aliases, add alias for lintian.

Emmanuel Bouthenot 15 years ago
parent
commit
f295cf7784
4 changed files with 53 additions and 46 deletions
  1. 28 27
      .mailfilter
  2. 18 17
      .mutt/conf/mailboxes
  3. 2 2
      .zsh.d/config.d/alias.zsh
  4. 5 0
      .zsh.d/os.d/Debian.zsh

+ 28 - 27
.mailfilter

@@ -7,31 +7,22 @@ VERBOSE=9
 
 MAILDROP_OLD_REGEXP=1
 
-logfile "/home/manu/Admin/logs/maildrop/maildrop.log"
-
-
-## Listes RMLL 2008
-if (/^To:.*organisation@rmll2008\.org.*$/ || /^Cc:.*organisation@rmll2008\.org.*$/ || /^X-BeenThere:.*2008@rmll\.info.*$/)
-	to  $MAILDIR/.my.ml.rmll.2008
-
-#if (/^List-Id:.*![^ <]+!\.rmll\.info.*$/)
-#	to $MAILDIR/.my.ml.rmll.$MATCH2
-if (/^List-Id:.*orga2009\.rmll\.info.*$/)
-	to $MAILDIR/.my.ml.rmll.pre-org
-if (/^List-Id:.*org\.rmll\.info.*$/)
-	to $MAILDIR/.my.ml.rmll.org
-if (/^List-Id:.*themes\.rmll\.info.*$/)
-	to $MAILDIR/.my.ml.rmll.themes
-if (/^List-Id:.*communication\.rmll\.info.*$/)
-	to $MAILDIR/.my.ml.rmll.communication
-if (/^List-Id:.*partenaires\.rmll\.info.*$/)
-	to $MAILDIR/.my.ml.rmll.partenaires
-if (/^List-Id:.*participants\.rmll\.info.*$/)
-	to $MAILDIR/.my.ml.rmll.participants
+logfile "/home/manu/var/logs/maildrop/maildrop.log"
+
+
+### Debian Lists
+if (/^X-BeenThere: !.*!@rmll\.info.*$/)
+{
+	exception {
+		`test -d $MAILDIR/.my.ml.rmll.$MATCH2`
+		if( $RETURNCODE == 1 )
+			`$MAILDIRMAKE $MAILDIR/.my.ml.rmll.$MATCH2`
+        	to $MAILDIR/.my.ml.rmll.$MATCH2
+	}
+}
 if (/^From:.*reservation@rmll\.info.*$/)
 	to $MAILDIR/.my.ml.rmll.resa
 
-
 ## Debian backports
 if (/^List-Id:.*<backports-users\.lists\.backports\.org>$/)
         to $MAILDIR/.my.ml.debian.backports
@@ -81,6 +72,17 @@ if (/^List-Id:.*<!.*!\.abul\.org>.*$/)
 	}
 }
 
+### Aquitaine libre lists
+if (/^List-Id:.*<!.*!\.listes\.aquitaine-libre\.info>.*$/)
+{
+	exception {
+		`test -d $MAILDIR/.my.ml.al.$MATCH2`
+		if( $RETURNCODE == 1 )
+			`$MAILDIRMAKE $MAILDIR/.my.ml.al.$MATCH2`
+        	to $MAILDIR/.my.ml.al.$MATCH2
+	}
+}
+
 ### WeeChat Lists
 if (/^List-Id:.*weechat-!.*!\.nongnu\.org.*$/ || /^To:.*weechat-!.*!\.nongnu.org\.*$/)
         to $MAILDIR/.my.soft.weechat.ml.$MATCH2
@@ -92,7 +94,7 @@ if (/^From:.*SYMPA/)
 }
 
 ### Logs Stuff
-if (/^From:.*logcheck@/ || /^Subject:.*rkhunter/)
+if (/^From:.*logcheck@/ || /^Subject:.*rkhunter/ || /^Subject:.*Logwatch for/)
         to $MAILDIR/.sys.reports
 
 ### Tiac Info
@@ -111,8 +113,7 @@ if ($CRMSCORE < -1)
     xfilter "formail -I \"X-CRM114-Spam: yes\""
 }
 
-log "Spam: $CRMSCORE"
-
+#log "Spam: $CRMSCORE"
 #if (/^X-CRM114-Spam: yes/)
 #{
 #    to $MAILDIR/.Spam
@@ -125,8 +126,8 @@ if (/^X-Spam-Status: YES/)
     to $MAILDIR/.Spam
 }
 
-#if (!/^From:.*/ || /^Subject:.*[??SPAM??].*/)
-#    to $MAILDIR/.Spam
+if (!/^From:.*/ || /^Subject:.*\[\*\*SPAM\*\*\].*/)
+	to $MAILDIR/.Spam
 
 ########### INBOX ###############
 to $MAILDIR/

+ 18 - 17
.mutt/conf/mailboxes

@@ -25,38 +25,39 @@ mailboxes +.friends.tbs.tiacfooting
 mailboxes +.my.soft.weechat.ml.cvs
 mailboxes +.my.soft.weechat.ml.dev
 mailboxes +.my.soft.galette.devel
-mailboxes +.my.ml.rmll.pre-org
-mailboxes +.my.ml.rmll.admin
-mailboxes +.my.ml.rmll.communication
+mailboxes +.my.ml.asyd.sysadmin
+mailboxes +.my.ml.asyd.emacs
+mailboxes +.my.ml.asyd.shell
 mailboxes +.my.ml.rmll.org
-mailboxes +.my.ml.rmll.partenaires
-mailboxes +.my.ml.rmll.participants
+mailboxes +.my.ml.rmll.communication
+mailboxes +.my.ml.rmll.admin
 mailboxes +.my.ml.rmll.resa
 mailboxes +.my.ml.rmll.themes
-mailboxes +.my.ml.rmll.theme-web
-mailboxes +.my.ml.asyd.emacs
-mailboxes +.my.ml.asyd.shell
-mailboxes +.my.ml.asyd.sysadmin
-mailboxes +.my.ml.abul.abonnes
+mailboxes +.my.ml.rmll.partenaires
+mailboxes +.my.ml.rmll.participants
+mailboxes +.my.ml.rmll.debats
+mailboxes +.my.ml.al.organisation
 mailboxes +.my.ml.abul.admin
-mailboxes +.my.ml.abul.annonces
+mailboxes +.my.ml.abul.misc
 mailboxes +.my.ml.abul.asso
-mailboxes +.my.ml.abul.blahblah
 mailboxes +.my.ml.abul.ca
+mailboxes +.my.ml.abul.web
+mailboxes +.my.ml.abul.tech
+mailboxes +.my.ml.abul.rmll
+mailboxes +.my.ml.abul.blahblah
+mailboxes +.my.ml.abul.party
 mailboxes +.my.ml.abul.debutants
 mailboxes +.my.ml.abul.devel
 mailboxes +.my.ml.abul.hourtin
 mailboxes +.my.ml.abul.inscrits
-mailboxes +.my.ml.abul.misc
-mailboxes +.my.ml.abul.party
-mailboxes +.my.ml.abul.rmll
-mailboxes +.my.ml.abul.tech
-mailboxes +.my.ml.abul.web
+mailboxes +.my.ml.abul.abonnes
+mailboxes +.my.ml.abul.annonces
 mailboxes +.my.ml.debian.france.abonnes
 mailboxes +.my.ml.debian.france.asso
 mailboxes +.my.ml.debian.france.cabal
 mailboxes +.my.ml.debian.france.sl
 mailboxes +.my.soft.debian.pkg.phototools
+mailboxes +.my.ml.debian.release
 mailboxes +.my.ml.debian.announce
 mailboxes +.my.ml.debian.backports
 mailboxes +.my.ml.debian.bugs-rc

+ 2 - 2
.zsh.d/config.d/alias.zsh

@@ -15,11 +15,11 @@ alias reload="exec zsh"
 alias grep="grep --color=tty"
 
 alias slog="tail -n 60 -f /var/log/syslog"
-alias mlog="tail -n 60 -f /var/log/maik.log"
+alias mlog="tail -n 60 -f /var/log/mail.log"
 
 # using colortail if available (freebsd)
 -exe colortail \
-    && alias lm="colortail -n 60 -k /usr/local/share/examples/colortail/conf.messages -f /var/log/syslog"
+    && alias slog="colortail -n 60 -k /usr/local/share/examples/colortail/conf.messages -f /var/log/syslog"
 
 [ -n "$EDITOR" -a -n "$SUDO_USER" -a $UID = 0 -a $EDITOR[1,5] = "emacs" ] \
     && alias e="$EDITOR -u $SUDO_USER"

+ 5 - 0
.zsh.d/os.d/Debian.zsh

@@ -1,6 +1,11 @@
 
 # Debian stuff
 
+# specific aliases
+alias lintian="lintian --color=auto -IEm"
+
+# building environements
+
 function cow-dist () {
     [ $# -lt 2 ] \
 	&& echo "Error args." \