diff --git a/gestion/gen_confs/dhcpd_new.py b/gestion/gen_confs/dhcpd_new.py index f0ce48b2..b325772b 100755 --- a/gestion/gen_confs/dhcpd_new.py +++ b/gestion/gen_confs/dhcpd_new.py @@ -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' } diff --git a/gestion/ldap_crans.py b/gestion/ldap_crans.py index 0163e8f1..a13e938c 100644 --- a/gestion/ldap_crans.py +++ b/gestion/ldap_crans.py @@ -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: