From: Vincent Le Gallic <legallic@crans.org>
Date: Sun, 18 Aug 2013 11:10:57 +0000 (+0200)
Subject: Merge branch 'master' into perso
X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=611906ce1639c4962d3d4c02f633b1210bea6dc2;hp=7ffbc9080be3af3ef6ce16d678dab0c9c2f70591;p=config-20-100.git

Merge branch 'master' into perso
---

diff --git a/.procmailrc b/.procmailrc
index b8f3c75..711cab1 100644
--- a/.procmailrc
+++ b/.procmailrc
@@ -412,10 +412,6 @@ INCLUDERC="${CONFIGDIR}/custom.high.rules"
   * ^Subject:.*monit \/[^ \.]+
   ${MONITDIR}.${MATCH}/
   
-  :0
-  * ^Subject:.*logwatch for
-  ${MONITDIR}.${MATCH}/
-  
   # Dossier de Monit par défaut, si Monit se met à envoyer d'autres mails
   :0
   ${MONITDIR}/
@@ -890,6 +886,10 @@ INCLUDERC="${CONFIGDIR}/custom.normal.rules"
   :0
   * ^List-Id:.*lists.federez.net
   {
+    :0
+    * ^Subject:.*Logwatch for.*federez\.net
+    ${FEDEREZLOGWATCHDIR}/
+    
     :0
     ${FEDEREZDIR}.${ML_}/
   }