From 1f69217a4b961cddb899fd12b77967e3780ab486 Mon Sep 17 00:00:00 2001 From: bernat Date: Mon, 20 Dec 2004 12:07:53 +0100 Subject: [PATCH] Le DHCP de Nectaris n'est pas encore fonctionnel pour le wifi darcs-hash:20041220110753-d1718-26390298b650e206fe6f88c9b890a402798fc461.gz --- gestion/gen_confs/generate.py | 2 +- gestion/ldap_crans.py | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/gestion/gen_confs/generate.py b/gestion/gen_confs/generate.py index e481071a..a8c0ef3c 100755 --- a/gestion/gen_confs/generate.py +++ b/gestion/gen_confs/generate.py @@ -321,7 +321,7 @@ Subject: Modifications sur une machine du CR@NS from gen_confs.bind import dns inst.append([dns(),"dns"]) - if 'dhcp' in to_do.keys() or 'dhcp-nectaris' in to_do.keys() : + if 'dhcp' in to_do.keys() : from gen_confs.dhcpd import dhcp inst.append([dhcp(),"dhcp"]) diff --git a/gestion/ldap_crans.py b/gestion/ldap_crans.py index a370a78c..38c5843b 100755 --- a/gestion/ldap_crans.py +++ b/gestion/ldap_crans.py @@ -1103,7 +1103,7 @@ class base_proprietaire(base_classes_crans) : self.services_to_restart('dhcp-nectaris') else : self.services_to_restart('switch',[self.chbre()]) - self.services_to_restart('dhcp') + self.services_to_restart('dhcp') # Vérification si changement de bât, ce qui obligerai un changement d'IP if 'chbre' in self.modifs and self.chbre()!='????' : @@ -2062,8 +2062,7 @@ class machine(base_classes_crans) : self.services_to_restart('firewall-komaz' , reconf_ip) if self.__typ == 'wifi' : self.services_to_restart('dhcp-nectaris') - else : - self.services_to_restart('dhcp') + self.services_to_restart('dhcp') if 'ports' in self.modifs : self.services_to_restart('firewall-komaz-ports', [ self.ip() ] ) @@ -2112,8 +2111,7 @@ class machine(base_classes_crans) : if self.__typ == 'wifi' : self.services_to_restart('conf_wifi') self.services_to_restart('dhcp-nectaris') - else : - self.services_to_restart('dhcp') + self.services_to_restart('dhcp') self.services_to_restart('dns') self.services_to_restart('firewall',[ self.ip() ])