From: Vincent Le Gallic <legallic@crans.org>
Date: Sun, 18 Aug 2013 11:13:22 +0000 (+0200)
Subject: Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchpers... 
X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=210eee338643d5734ab408ba2d2d2a004b469793;hp=-c;p=config-20-100.git

Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchperso into perso

Conflicts:
	.procmail/rc/ML_perso
---

210eee338643d5734ab408ba2d2d2a004b469793
diff --combined .procmailrc
index 711cab1,b8f3c75..8909a23
--- a/.procmailrc
+++ b/.procmailrc
@@@ -412,6 -412,10 +412,10 @@@ INCLUDERC="${CONFIGDIR}/custom.high.rul
    * ^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}/
@@@ -886,10 -890,6 +890,10 @@@ INCLUDERC="${CONFIGDIR}/custom.normal.r
    :0
    * ^List-Id:.*lists.federez.net
    {
 +    :0
 +    * ^Subject:.*Logwatch for.*federez\.net
 +    ${FEDEREZLOGWATCHDIR}/
 +    
      :0
      ${FEDEREZDIR}.${ML_}/
    }