crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[generate.py,ldap_crans.py] On ne programme plus la reconfiguration de services qui n'existent plus.

Browse source
This commit is contained in:
Valentin Samir 2013-02-13 15:15:18 +01:00
parent ab5320bfd2
commit d735b21bb9
2 changed files with 0 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

25
gestion/gen_confs/generate.py
View file

@ -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

23
gestion/ldap_crans.py
View file

@ -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')