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

[firewall] les machines du G ont l'adresse mac de dyson

Browse source 
darcs-hash:20091119014757-61eff-a1639fb9a73867605e583388cab48a7c958266e2.gz
This commit is contained in:
Stephane Glondu 2009-11-19 02:47:57 +01:00
parent 1b03d6517b
commit f49f2546a8
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gestion/config.py
View file

@ -44,6 +44,7 @@ cimetiere = '/home/cimetiere'
mac_komaz = '00:19:BB:31:3B:80' mac_komaz = '00:19:BB:31:3B:80'
mac_wifi = '00:0f:1f:66:e0:e8' mac_wifi = '00:0f:1f:66:e0:e8'
mac_titanic = 'aa:73:65:63:6f:76' mac_titanic = 'aa:73:65:63:6f:76'
mac_g = '00:0f:1f:66:e5:92'
## Serveur principal de bcfg2 ## Serveur principal de bcfg2
bcfg2_main = "vert.adm.crans.org" bcfg2_main = "vert.adm.crans.org"

6
gestion/gen_confs/firewall.py
View file

@ -35,7 +35,7 @@ from ldap_crans import AssociationCrans, Machine, MachineWifi, BorneWifi
from affich_tools import * from affich_tools import *
from commands import getstatusoutput from commands import getstatusoutput
from iptools import AddrInNet, NetSubnets, IpSubnet from iptools import AddrInNet, NetSubnets, IpSubnet
from config import NETs, mac_komaz, mac_wifi, mac_titanic, conf_fw, p2p, vlans, debit_max_radin from config import NETs, mac_komaz, mac_wifi, mac_titanic, mac_g, conf_fw, p2p, vlans, debit_max_radin
syslog.openlog('firewall') syslog.openlog('firewall')
debug = 1 debug = 1
@ -256,6 +256,10 @@ 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 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