X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;f=.procmailrc;h=711cab12bbedda4d31127096eb0bb211dfa97181;hb=611906ce1639c4962d3d4c02f633b1210bea6dc2;hp=d7cd35cbbe0cfc4e8d68264dded2dd41663b57c5;hpb=c5f63d247136fae88e99cba6c5d3a7dcce322e71;p=config-20-100.git

diff --git a/.procmailrc b/.procmailrc
index d7cd35c..711cab1 100644
--- a/.procmailrc
+++ b/.procmailrc
@@ -86,6 +86,9 @@
 # ./|    |
 # ./|    |-[*+B] federez
 # ./|    |-[F] admin
+# ./|    |  |
+# ./|    |  |-[F] logwatch
+# ./|    |
 # ./|    |-[(F)] monit
 # ./|
 # ./|
@@ -146,7 +149,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
 # ./|    |     |
@@ -349,6 +353,7 @@ ROOTDEFAULTDIR="${TECHNIQUEDIR}.root"
 ### Dossier racine pour Federez
 FEDEREZDIR="${CRANS_FOLDER}.FedeRez"
 FEDEREZMONITDIR="${FEDEREZDIR}.Monit"
+FEDEREZLOGWATCHDIR="${FEDEREZDIR}.Logwatch"
 
 
 
@@ -481,7 +486,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 +828,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
@@ -881,6 +886,10 @@ INCLUDERC="${CONFIGDIR}/custom.normal.rules"
   :0
   * ^List-Id:.*lists.federez.net
   {
+    :0
+    * ^Subject:.*Logwatch for.*federez\.net
+    ${FEDEREZLOGWATCHDIR}/
+    
     :0
     ${FEDEREZDIR}.${ML_}/
   }