From a4fddfc7631aa2c435f9c5603e510ae5d90d3f19 Mon Sep 17 00:00:00 2001
From: bernat <none>
Date: Mon, 29 Nov 2004 09:03:09 +0100
Subject: [PATCH] Debut de support du DHCP de Nectaris

darcs-hash:20041129080309-d1718-b92ff2213735fc431e4374b0997e97cdc1bcb6e2.gz
---
 gestion/ldap_crans.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gestion/ldap_crans.py b/gestion/ldap_crans.py
index 51eeaeaf..4b06f497 100755
--- a/gestion/ldap_crans.py
+++ b/gestion/ldap_crans.py
@@ -48,7 +48,7 @@ random.seed()                           # On initialise le g
 
 ##################################################################################
 ### Différent services redémarrables
-#dns, dhcp, firewall, bornes_wifi(nom_borne), conf_wifi, bl_carte_etudiant, switch(chbre)
+#dns, dhcp, firewall, bornes_wifi(nom_borne), conf_wifi, bl_carte_etudiant, switch(chbre), dhcp-nectaris
 
 ##################################################################################
 ### Items de la blackliste 
@@ -860,9 +860,9 @@ class base_classes_crans(crans_ldap) :
 	# Correspondance modif de la base -> service ayant besoin d'être redémarré
 	# pour paiement et carte d'étudiant : traitement dans la classe adhérent 
 	# car il faut vérifier l'existance de machines
-	annuaire_modif_service = { 'host' : [ 'dhcp', 'dns'  ], 
-	                           'ipHostNumber' : [ 'dhcp', 'dns', 'firewall' ],
-				   'macAddress' : [ 'dhcp', 'dns', 'firewall' ],
+	annuaire_modif_service = { 'host' : [ 'dhcp', 'dhcp-nectaris', 'dns'  ], 
+	                           'ipHostNumber' : [ 'dhcp', 'dhcp-nectaris', 'dns', 'firewall' ],
+				   'macAddress' : [ 'dhcp', 'dhcp-nectaris', 'dns', 'firewall' ],
 				   'ipsec' : [ 'conf_wifi' ], 
 				   'hostAlias' : [ 'dns' ] ,
 				   'droits' : [ 'droits' ] ,
@@ -1131,7 +1131,7 @@ class base_proprietaire(base_classes_crans) :
 		    elif not self.chbre() in serv :
 			self.services_to_restart('switch',[self.chbre()])
 		if self.machines() :
-		    for s in ['dhcp', 'dns', 'firewall' ] :
+		    for s in ['dhcp', 'dhcp-nectaris', 'dns', 'firewall' ] :
 			if s not in serv :
 			    serv.append(s)
 
@@ -2088,6 +2088,7 @@ class machine(base_classes_crans) :
 	self._delete(self.dn,comment)
 	
 	self.services_to_restart('dhcp')
+	self.services_to_restart('dhcp-nectaris')
 	self.services_to_restart('dns')
 	self.services_to_restart('firewall',[ self.nom() ])