From 9669a3691f256dc82c4f9c1dd1eafd43a173007b Mon Sep 17 00:00:00 2001 From: Nicolas Dandrimont Date: Tue, 12 Jan 2010 01:28:33 +0100 Subject: [PATCH] [...] La connexion temporaire du G n'est plus pertinente darcs-hash:20100112002833-ffbb2-c575ff5637a3fe18d3d842de01d176afb914cdf3.gz --- gestion/config.py | 1 - gestion/gen_confs/firewall.py | 4 ---- gestion/gen_confs/switchs.py | 3 --- 3 files changed, 8 deletions(-) diff --git a/gestion/config.py b/gestion/config.py index 9ebd730a..eb674c66 100644 --- a/gestion/config.py +++ b/gestion/config.py @@ -375,7 +375,6 @@ NETs = { 'serveurs' : [ '138.231.136.0/28' ], '138.231.138.0/24', '138.231.139.0/24', '138.231.140.0/22' ], - 'adh-g' : [ '138.231.151.0/24' ], 'bornes' : [ '138.231.148.0/24' ], 'vlan-adm' : [ '10.231.136.0/24' ], 'wifi-adh' : [ '138.231.144.0/24', '138.231.145.0/24', '138.231.146.0/24', diff --git a/gestion/gen_confs/firewall.py b/gestion/gen_confs/firewall.py index 9e5f3946..e1303584 100644 --- a/gestion/gen_confs/firewall.py +++ b/gestion/gen_confs/firewall.py @@ -256,10 +256,6 @@ class firewall_crans : # Machine wifi, c'est la mac de Nectaris iptables("-t nat %s TEST_MAC-IP -s "%(insert)+\ "%s -m mac --mac-source %s -j RETURN"%(ip, mac_wifi)) - elif hostname != "dyson" and ip.startswith('138.231.151.'): - # Machine du G, c'est la mac de dyson - iptables("-t nat %s TEST_MAC-IP -s "%(insert)+\ - "%s -m mac --mac-source %s -j RETURN"%(ip, mac_g)) elif machine.nom() == "ovh.adm.crans.org": # Pour ovh, on met les MACs de komaz et de titanic # qui font proxy ARP diff --git a/gestion/gen_confs/switchs.py b/gestion/gen_confs/switchs.py index 2ca401ca..da4ccdf3 100644 --- a/gestion/gen_confs/switchs.py +++ b/gestion/gen_confs/switchs.py @@ -260,9 +260,6 @@ exit bat = switch[3].lower() sw_num = int(switch[5]) dhcp_server = self.dhcp_server - # Au bātiment G, on utilise un autre serveur DHCP - if bat == 'g': - dhcp_server = '138.231.151.1' # Conf radius sys.path.append('/usr/scripts/gestion/secrets') from secrets import radius_key