From d735b21bb9b5b57c953806d72f3a93f7fcad2254 Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Wed, 13 Feb 2013 15:15:18 +0100 Subject: [PATCH] [generate.py,ldap_crans.py] On ne programme plus la reconfiguration de services qui n'existent plus. --- gestion/gen_confs/generate.py | 25 ------------------------- gestion/ldap_crans.py | 23 ----------------------- 2 files changed, 48 deletions(-) diff --git a/gestion/gen_confs/generate.py b/gestion/gen_confs/generate.py index 6b2b84c0..6dc7f46a 100755 --- a/gestion/gen_confs/generate.py +++ b/gestion/gen_confs/generate.py @@ -281,9 +281,6 @@ class dhcp(base_reconfigure): self._do(dhcp(), self._machines()) class sable(base_reconfigure): - def dhcp(self): - from gen_confs.dhcpd_new import dhcp - self._do(dhcp(), self._machines()) def dns(self): from gen_confs.bind import dns @@ -302,28 +299,6 @@ class charybde(base_reconfigure): class routeur(base_reconfigure): pass -class ragnarok(base_reconfigure): - __restart_wifi_update = False - - def macip(self): - # Surcharge car rien ŕ faire ici - pass - - def conf_wifi_ng(self): - from gen_confs.wifi_ng import conf_wifi_ng - bornes = None - if os.getenv("BORNE"): - bornes = os.getenv("BORNE").split(",") - self._do(conf_wifi_ng(bornes)) - - def dhcp(self): - from gen_confs.dhcpd import dhcp - self._do(dhcp(), self._machines()) - - def droits(self): - from gen_confs.droits import droits_openbsd - self._do(droits_openbsd()) - class gordon(base_reconfigure) : def dhcp(self): from gen_confs.dhcpd_new import dhcp diff --git a/gestion/ldap_crans.py b/gestion/ldap_crans.py index 663d4d48..5810a8c5 100755 --- a/gestion/ldap_crans.py +++ b/gestion/ldap_crans.py @@ -1903,14 +1903,6 @@ class BaseProprietaire(BaseClasseCrans): self.services_to_restart('classify', [m.ip()] ) self.services_to_restart('dns') self.services_to_restart('dhcp-dhcp') - if isinstance(m, MachineWifi): - self.services_to_restart('conf_wifi_ng') - self.services_to_restart('gordon-dhcp') - else: - self.services_to_restart('sable-dhcp') - self.services_to_restart('dyson-dhcp') - # TODO : le rendre plus propre - self.services_to_restart('titanic-dhcp') # VĂ©rification si changement de bât, ce qui obligerai un changement d'IP if 'adherentPayant' in self.modifs or 'chbre' in self.modifs and self.chbre() != '????': @@ -3208,13 +3200,6 @@ Contactez nounou si la MAC est bien celle d'une carte.""", 3) self.services_to_restart('macip', reconf_ip) self.services_to_restart('classify', reconf_ip) self.services_to_restart('dhcp-dhcp') - if isinstance(self, MachineWifi) or isinstance(self, BorneWifi): - self.services_to_restart('gordon-dhcp') - else: - self.services_to_restart('sable-dhcp') - # TODO : le rendre plus propre - self.services_to_restart('titanic-dhcp') - self.services_to_restart('dyson-dhcp') if 'portTCPin' in self.modifs or 'portTCPout' in self.modifs or \ 'portUDPin' in self.modifs or 'portUDPout' in self.modifs: self.services_to_restart('komaz-ports', [self.ip()]) @@ -3281,14 +3266,6 @@ Contactez nounou si la MAC est bien celle d'une carte.""", 3) # Services Ă  redĂ©marrer self.services_to_restart('dhcp-dhcp') - if isinstance(self, MachineWifi): - self.services_to_restart('conf_wifi_ng') - self.services_to_restart('gordon-dhcp') - else: - self.services_to_restart('sable-dhcp') - self.services_to_restart('dyson-dhcp') - # TODO : le rendre plus propre - self.services_to_restart('titanic-dhcp') if self.exempt(): self.services_to_restart('surveillance_exemptions')