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

[...] La connexion temporaire du G n'est plus pertinente

Browse source 
darcs-hash:20100112003022-ffbb2-48e262e78b482d67acad0c1af1c936d3bfa83022.gz
This commit is contained in:
Nicolas Dandrimont 2010-01-12 01:30:22 +01:00
parent 9669a3691f
commit 825b5d2a78
2 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gestion/gen_confs/dhcpd_new.py
View file

@ -29,9 +29,6 @@ class dhcp(gen_config) :
elif hostname == 'titanic':
restart_cmd = '/etc/init.d/dhcp3-server restart'
reseaux = { '10.2.9.0/24' : '/etc/dhcp3/generated/appartements.liste' }
elif hostname == 'dyson':
restart_cmd = '/etc/init.d/dhcp3-server restart'
reseaux = { NETs['adh-g'][0] : '/etc/dhcp3/generated/adh-g.liste' }
elif hostname == 'gordon':
restart_cmd = '/etc/init.d/dhcp3-server restart'
reseaux = { '138.231.144.0/21' : '/etc/dhcp3/generated/wifi.liste' }

5
gestion/ldap_crans.py
View file

@ -2832,9 +2832,6 @@ Contactez nounou si la MAC est bien celle d'une carte.""", 3)
pool_ip = lister_ip_dispo('all')
else:
proprio = self.proprietaire()
if proprio.chbre()[0] in [ 'g', 'G' ]:
net = config.NETs['adh-g']
pool_ip = lister_ip_dispo('adh-g')
if proprio.etudes(0) == 'Personnel ENS':
net = config.NETs['personnel-ens']
@ -2842,8 +2839,6 @@ Contactez nounou si la MAC est bien celle d'une carte.""", 3)
elif not isinstance(proprio, Adherent) or proprio.adherentPayant():
proprio_subnet = 'adherents'
try:
if self.nom().endswith("-g.crans.org"):
proprio_subnet = 'adh-g'
net = config.NETs[proprio_subnet]
pool_ip = lister_ip_dispo(proprio_subnet)
except: