From d50435963cac18ccd0e23bde41f3a641fea5dea6 Mon Sep 17 00:00:00 2001
From: Daniel STAN <daniel.stan@crans.org>
Date: Sun, 15 Jul 2012 19:41:49 +0200
Subject: [PATCH] [rsyslog] send_relp => 50-send_relp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ignore-this: a2f908a874fa21dc99b21b90e2bedf44
Il va être pratique d'ordonner les règles de logs (les règles pour
les sources, on s'en fiche un peu) afin de ne pas forcément tout
balancer à ragnarok (discard dans un fichier < 50)

darcs-hash:20120715174149-28565-cf55d5a56626ce56bc08b5353ac35beaac357659.gz
---
 Bundler/rsyslog.xml                                            | 3 ++-
 .../send_relp.conf => 50-send_relp.conf/50-send_relp.conf}     | 0
 Rules/rules.xml                                                | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)
 rename Cfg/etc/rsyslog.d/{send_relp.conf/send_relp.conf => 50-send_relp.conf/50-send_relp.conf} (100%)

diff --git a/Bundler/rsyslog.xml b/Bundler/rsyslog.xml
index d1c4446..47d8ab3 100644
--- a/Bundler/rsyslog.xml
+++ b/Bundler/rsyslog.xml
@@ -8,7 +8,8 @@
 
   <Group name="syslog-client">
     <Group name="syslog-server" negate="true">
-        <ConfigFile name="/etc/rsyslog.d/send_relp.conf"/>
+        <ConfigFile name="/etc/rsyslog.d/50-send_relp.conf"/>
+        <Action name="rsyslog-clean-sendrelp" />
     </Group>
   </Group>
 
diff --git a/Cfg/etc/rsyslog.d/send_relp.conf/send_relp.conf b/Cfg/etc/rsyslog.d/50-send_relp.conf/50-send_relp.conf
similarity index 100%
rename from Cfg/etc/rsyslog.d/send_relp.conf/send_relp.conf
rename to Cfg/etc/rsyslog.d/50-send_relp.conf/50-send_relp.conf
diff --git a/Rules/rules.xml b/Rules/rules.xml
index bece4b1..7d5c023 100644
--- a/Rules/rules.xml
+++ b/Rules/rules.xml
@@ -95,6 +95,8 @@
       command="ln -s /etc/init.d/attendre-vert /etc/rcS.d/S41attendre-vert" /> 
 
   <Service type="deb" name="rsyslog" status="on"/>
+  <Action name="rsyslog-clean-sendrelp" timing="post" when="modified" status="check"
+    command="rm /etc/rsyslog.d/send_relp.conf" />
   <Service type="deb" name="slapd" status="on"/>
   <Service type="deb" name="nslcd" status="on"/>
   <Service type="deb" name="munin-node" status="on"/>