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:20100112002833-ffbb2-c575ff5637a3fe18d3d842de01d176afb914cdf3.gz
This commit is contained in:
Nicolas Dandrimont 2010-01-12 01:28:33 +01:00
parent fe8d513447
commit 9669a3691f
3 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gestion/config.py
View file

@ -375,7 +375,6 @@ NETs = { 'serveurs' : [ '138.231.136.0/28' ],
'138.231.138.0/24', '138.231.138.0/24',
'138.231.139.0/24', '138.231.139.0/24',
'138.231.140.0/22' ], '138.231.140.0/22' ],
'adh-g' : [ '138.231.151.0/24' ],
'bornes' : [ '138.231.148.0/24' ], 'bornes' : [ '138.231.148.0/24' ],
'vlan-adm' : [ '10.231.136.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', 'wifi-adh' : [ '138.231.144.0/24', '138.231.145.0/24', '138.231.146.0/24',

4
gestion/gen_confs/firewall.py
View file

@ -256,10 +256,6 @@ class firewall_crans :
# Machine wifi, c'est la mac de Nectaris # Machine wifi, c'est la mac de Nectaris
iptables("-t nat %s TEST_MAC-IP -s "%(insert)+\ iptables("-t nat %s TEST_MAC-IP -s "%(insert)+\
"%s -m mac --mac-source %s -j RETURN"%(ip, mac_wifi)) "%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": elif machine.nom() == "ovh.adm.crans.org":
# Pour ovh, on met les MACs de komaz et de titanic # Pour ovh, on met les MACs de komaz et de titanic
# qui font proxy ARP # qui font proxy ARP

3
gestion/gen_confs/switchs.py
View file

@ -260,9 +260,6 @@ exit
bat = switch[3].lower() bat = switch[3].lower()
sw_num = int(switch[5]) sw_num = int(switch[5])
dhcp_server = self.dhcp_server 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 # Conf radius
sys.path.append('/usr/scripts/gestion/secrets') sys.path.append('/usr/scripts/gestion/secrets')
from secrets import radius_key from secrets import radius_key