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

[firewall4] Petit modification sur les animation de progression

Browse source
This commit is contained in:
Valentin Samir 2014-02-22 18:59:53 +01:00
parent 6ab35a2cfa
commit f58ef89ffc
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gestion/gen_confs/firewall4/base.py
View file

@ -109,9 +109,9 @@ class firewall(utils.firewall_tools) :
chain = 'BLACKLIST_HARD'
if fill_ipset:
anim('\tRestoration de l\'ipset %s' % self.ipset['blacklist']['hard'])
# On récupère la liste de toutes les ips blacklistés hard
bl_hard_ips = self.blacklisted_ips(config.blacklist_sanctions, config.NETs['all'])
anim('\tRestoration de l\'ipset %s' % self.ipset['blacklist']['hard'])
self.ipset['blacklist']['hard'].restore(bl_hard_ips)
print OK

4
gestion/gen_confs/firewall4/komaz.py
View file

@ -310,9 +310,9 @@ class firewall(base.firewall_routeur):
chain = 'BLACKLIST_SOFT'
if fill_ipset:
anim('\tRestoration de l\'ipset %s' % self.ipset['blacklist']['soft'])
# On récupère la liste de toutes les ips blacklistés soft
bl_soft_ips = self.blacklisted_ips(base.config.blacklist_sanctions_soft, base.config.NETs['all'])
anim('\tRestoration de l\'ipset %s' % self.ipset['blacklist']['soft'])
self.ipset['blacklist']['soft'].restore(bl_soft_ips)
print OK
@ -352,9 +352,9 @@ class firewall(base.firewall_routeur):
chain = 'BLACKLIST_UPLOAD'
if fill_ipset:
anim('\tRestoration de l\'ipset %s' % self.ipset['blacklist']['upload'])
# On récupère la liste de toutes les ips blacklistés pour upload
bl_upload_ips = self.blacklisted_ips(base.config.blacklist_bridage_upload, base.config.NETs['all'])
anim('\tRestoration de l\'ipset %s' % self.ipset['blacklist']['upload'])
self.ipset['blacklist']['upload'].restore(bl_upload_ips)
print OK

5
gestion/gen_confs/firewall4/utils.py
View file

@ -63,8 +63,10 @@ class firewall_tools(object) :
# les machine.proprio() soit déjà peuplés. En effet, on regarde
# les blacklistes d'un proprio lorsque l'on regarde les blacklistes
# d'une machine
anim('\tChargement des machines')
self._machines, self._adherents = self.conn.allMachinesAdherents()
self._adherents = [ adh for adh in self._adherents if adh.paiement_ok() ]
print OK
return self._machines
def adherents(self):
@ -241,10 +243,7 @@ class firewall_tools(object) :
def start(self):
"""Démarre le pare-feu : génère les règles, puis les restore"""
anim('\tChargement des machines')
self.machines()
self.blacklisted_machines()
print OK
if squeeze:
anim('\tVidage du pare-feu')