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

Changement de nom vlan-adm -> adm

Browse source 
darcs-hash:20100118224234-8fbb1-06a3a864b4ed44147ebf6a747500c7a5f13f0cca.gz
This commit is contained in:
Olivier Huber 2010-01-18 23:42:34 +01:00
parent a8e851a7a3
commit f2216637a4
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gestion/config.py
View file

@ -376,7 +376,7 @@ NETs = { 'serveurs' : [ '138.231.136.0/28' ],
'138.231.139.0/24',
'138.231.140.0/22' ],
'bornes' : [ '138.231.148.0/24' ],
'vlan-adm' : [ '10.231.136.0/24' ],
'adm' : [ '10.231.136.0/24' ],
'wifi-adh' : [ '138.231.144.0/24', '138.231.145.0/24', '138.231.146.0/24',
'138.231.147.0/24', '138.231.149.0/24', '138.231.150.0/24' ],
'fil' : [ '138.231.136.0/21' ],

10
gestion/gen_confs/firewall.py
View file

@ -109,7 +109,7 @@ class firewall_crans :
verif MAC-IP.
"""
zone_serveur = NETs['serveurs'][0]
vlan_adm = NETs['vlan-adm'][0]
vlan_adm = NETs['adm'][0]
adm_users = [ "root", "identd", "daemon", "postfix", "freerad", "amavis", "nut", "respbats", "list", "sqlgrey", "ntpd", "lp" ]
@ -1089,7 +1089,7 @@ class firewall_zamok(firewall_crans) :
iptables("-t nat -A PREROUTING -i lo -j ACCEPT")
iptables("-t nat -A PREROUTING -d 224.0.0.0/4 -j DROP")
for net in NETs['fil'] + NETs['vlan-adm'] + NETs['wifi'] :
for net in NETs['fil'] + NETs['adm'] + NETs['wifi'] :
iptables("-t nat -A PREROUTING -s %s -j TEST_MAC-IP" % net)
iptables("-t filter -A OUTPUT -o lo -j ACCEPT")
@ -1143,7 +1143,7 @@ class firewall_rouge(firewall_crans) :
iptables("-t nat -A PREROUTING -i lo -j ACCEPT")
iptables("-t nat -A PREROUTING -d 224.0.0.0/4 -j DROP")
for net in NETs['fil'] + NETs['vlan-adm'] + NETs['wifi'] :
for net in NETs['fil'] + NETs['adm'] + NETs['wifi'] :
iptables("-t nat -A PREROUTING -s %s -j TEST_MAC-IP" % net)
iptables("-t nat -P PREROUTING ACCEPT")
@ -1184,7 +1184,7 @@ class firewall_vert(firewall_crans) :
iptables("-t nat -A PREROUTING -i lo -j ACCEPT")
iptables("-t nat -A PREROUTING -d 224.0.0.0/4 -j DROP")
for net in NETs['fil'] + NETs['vlan-adm'] + NETs['wifi'] :
for net in NETs['fil'] + NETs['adm'] + NETs['wifi'] :
iptables("-t nat -A PREROUTING -s %s -j TEST_MAC-IP" % net)
iptables("-t nat -P PREROUTING ACCEPT")
@ -1303,7 +1303,7 @@ class firewall_gordon(firewall_crans) :
iptables("-t nat -A PREROUTING -i lo -j ACCEPT")
iptables("-t nat -A PREROUTING -d 224.0.0.0/4 -j DROP")
for net in NETs['fil'] + NETs['vlan-adm'] + NETs['wifi'] :
for net in NETs['fil'] + NETs['adm'] + NETs['wifi'] :
iptables("-t nat -A PREROUTING -s %s -j TEST_MAC-IP" % net)
iptables("-t nat -P PREROUTING ACCEPT")