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

On met aussi les invites dans le firewall de komaz

Browse source 
darcs-hash:20050421103248-d1718-56cce07e3cd8d53eb2791f9f13526bbc4fcb2990.gz
This commit is contained in:
bernat 2005-04-21 12:32:48 +02:00
parent adf6f79c05
commit 0c8afb662b
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gestion/gen_confs/firewall_komaz.py
View file

@ -22,7 +22,7 @@ sys.path.append('/usr/scripts/gestion')
import syslog import syslog
from lock import * from lock import *
from ldap_crans import crans_ldap, ann_scol, machine, crans from ldap_crans import crans_ldap, ann_scol, machine, crans, invite
from affich_tools import * from affich_tools import *
from commands import getstatusoutput from commands import getstatusoutput
from iptools import AddrInNet from iptools import AddrInNet
@ -543,9 +543,10 @@ class firewall_komaz :
if AddrInNet(ip,self.zone_serveur) : if AddrInNet(ip,self.zone_serveur) :
serveur_maj = True serveur_maj = True
else : else :
# Il faut avoir payé ou être une machine du crans # Il faut avoir payé ou être une machine du crans ou un invite
if crans_ldap().search('paiement=ok&ip=%s'% ip)['machine'] or \ if crans_ldap().search('paiement=ok&ip=%s'% ip)['machine'] or \
machine[0].proprietaire().__class__ == crans : machine[0].proprietaire().__class__ == crans or \
machine[0].proprietaire().__class__ == invite :
mac_ip_maj[ip] = machine[0] mac_ip_maj[ip] = machine[0]
else : else :
mac_ip_maj[ip] = None mac_ip_maj[ip] = None