From 1b50a7da9aa851520a9e058f678e3a7676326787 Mon Sep 17 00:00:00 2001
From: Daniel STAN <daniel.stan@crans.org>
Date: Sat, 25 May 2013 19:07:14 +0200
Subject: [PATCH] =?UTF-8?q?[monit]=20igmpproxy=20m=C3=A9rite=20sa=20ration?=
 =?UTF-8?q?alisation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Metadata/groups.xml       | 4 ++++
 Python/etc/monit/services | 8 +-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 647f735..d1357fe 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -389,6 +389,7 @@
     <Group name="vlan-isolement"/>
     <Group name="vlan-ens"/>
     <Group name="portail-captif"/>
+    <Group name="igmpproxy" />
   </Group>
 
   <Group name="puppet"
@@ -1370,6 +1371,9 @@
     <!-- rien à implémenter pour le moment -->
  </Group>
 
+ <Group name="igmpproxy" comment="Routage du multicast, binaire installé main.
+ Ce paquet sert principalement à monit"/>
+
  <Group name="sniffer"
    comment="Le serveur qui surveille le réseau">
    <Group name="arpwatch" />
diff --git a/Python/etc/monit/services b/Python/etc/monit/services
index 347a475..d17c6a2 100644
--- a/Python/etc/monit/services
+++ b/Python/etc/monit/services
@@ -248,13 +248,7 @@ for i in range(0,dernierecarte):
 @    if timestamp > 15 minutes then alert
 @
 
-if hostname in ['routeur']:
-    @# igmpproxy
-    @check process igmpproxy with pidfile /var/run/igmpproxy.pid
-    @    start program = "/etc/init.d/igmpproxy start"
-    @    stop program = "/etc/init.d/igmpproxy stop"
-    @    if 5 restarts within 5 cycles then timeout
-    @
+service('igmpproxy')
 
 if hostname == 'zamok':
     @# print_status