Merge branch 'master' into perso

[config-20-100.git] / .procmailrc

diff --git a/.procmailrc b/.procmailrc
index d7cd35cbbe0cfc4e8d68264dded2dd41663b57c5..c048e240c422bed963aadd6fe4c4af888b59ec6d 100644 (file)
--- a/.procmailrc
+++ b/.procmailrc
@@ -146,7 +146,8 @@
 # ./|    |
 # ./|    |-[*+] attention (cron)
 # ./|    |     |
-# ./|    |     |-[*+] à trier : roots/root ou par serveur
+# ./|    |     |-[*+] Triés selon les cronjob souvent rencontrés,
+# ./|    |     |      listés dans le fichier cron.folders
 # ./|    |
 # ./|    |-[*+] Argh
 # ./|    |     |
@@ -481,7 +482,7 @@ INCLUDERC="${CONFIGDIR}/custom.high.rules"
 
 # On matche tous les alias de root@crans.org
 :0
-* ^(To|Cc): .*(root|abuse|amavis|backup|bind|bin|clamav|daemon|ftpadm|ftpmaster|ftp-mirror|ftp|games|gnats|irc|list|logcheck|lp|mail|majordom|man|msql|munin|news|operator|postgres|proxy|sync|sys|usenet|uucp|webmaster|www-clubs|www-data|www-perso|postmaster|mailer-daemon)@crans\.org
+* ^(To|Cc): .*(root|abuse|amavis|backup|bind|bin|clamav|daemon|ftpadm|ftpmaster|ftp-mirror|ftp|games|gnats|irc|list|logcheck|lp|mail|majordom|man|msql|munin|news|operator|postgres|proxy|sync|sys|usenet|uucp|webmaster|www-clubs|www-data|www-perso|postmaster|mailer-daemon)@(crans\.org|crans\.ens-cachan\.fr)
 {
   # Spam de logcheck
   :0
@@ -823,7 +824,7 @@ INCLUDERC="${CONFIGDIR}/custom.normal.rules"
     # MLs SoNo
     :0
     * ? (grep "^${ML}$" ${CONFIGDIR}/ML_sono) || (echo "${ML}" | grep sono)
-    ${MLBDADIR}.${ML_}/
+    ${MLSONODIR}.${ML_}/
     
     # MLs Med
     :0