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

[firewall_new, ipset] Modifications pour pouvoir utiliser n'importequel set, optimisation pour wheezy

Browse source
This commit is contained in:
Valentin Samir 2013-04-03 09:59:35 +02:00
parent 2f71b57882
commit 406a6033f7
2 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gestion/gen_confs/firewall_new.py
View file

@ -343,16 +343,16 @@ class firewall_crans :
if ip.startswith("138.231.1"):
if machine.__class__.__name__ == "MachineWifi" and hostname != 'gordon':
# Machine Wifi, c'est la mac de gordon
rules[self.mac_ip_set].append((ip,mac_wifi))
rules[self.mac_ip_set].append("%s,%s" % (ip,mac_wifi))
else:
# Machine fixe
rules[self.mac_ip_set].append((ip,machine.mac()))
rules[self.mac_ip_set].append("%s,%s" % (ip,machine.mac()))
if machine.__class__.__name__ == "MachineWifi" and hostname == 'komaz':
rules[self.mac_ip_set_wifi].append((ip,machine.mac()))
rules[self.mac_ip_set_wifi].append("%s,%s" % (ip,machine.mac()))
elif machine.__class__.__name__ == "MachineWifi" and hostname != 'komaz':
rules[self.mac_ip_set_wifi].append((ip,mac_komaz))
rules[self.mac_ip_set_wifi].append("%s,%s" % (ip,mac_komaz))
elif ip.startswith("10.231.136."):
rules[self.mac_ip_adm_set].append((ip,machine.mac()))
rules[self.mac_ip_adm_set].append("%s,%s" % (ip,machine.mac()))
def mac_ip_gen(self):
self.anim = anim('\tChaîne TEST_MAC-IP', len(self.__machines()))
self.anim.reinit()