Esthtisme
darcs-hash:20050904220115-41617-0fb6c8720bfa863ac5985917b2912621c7bd31bd.gz
This commit is contained in:
parent
c9f049a768
commit
e9aafc09ae
1 changed files with 9 additions and 5 deletions
|
@ -44,11 +44,12 @@ class conf_wifi(gen_config) :
|
||||||
return 'wifi'
|
return 'wifi'
|
||||||
|
|
||||||
def _gen(self):
|
def _gen(self):
|
||||||
|
self.anim=anim('\r\tRecherche base LDAP')
|
||||||
clients = self.db.search('host=*.wifi.crans.org&paiement=ok')['machine'] + \
|
clients = self.db.search('host=*.wifi.crans.org&paiement=ok')['machine'] + \
|
||||||
invite().machines()
|
invite().machines()
|
||||||
bornes = self.db.search('host=*.wifi.crans.org&ipsec!=*')['machine']
|
bornes = self.db.search('host=*.wifi.crans.org&ipsec!=*')['machine']
|
||||||
|
|
||||||
print
|
print OK
|
||||||
self.gen_isakmpd(clients)
|
self.gen_isakmpd(clients)
|
||||||
self.gen_macip(clients, bornes)
|
self.gen_macip(clients, bornes)
|
||||||
self.gen_bornes(bornes)
|
self.gen_bornes(bornes)
|
||||||
|
@ -62,7 +63,7 @@ class conf_wifi(gen_config) :
|
||||||
COMMON = "%s/common" % ROOT
|
COMMON = "%s/common" % ROOT
|
||||||
DEFAULT = "%s/default" % ROOT
|
DEFAULT = "%s/default" % ROOT
|
||||||
for borne in bornes:
|
for borne in bornes:
|
||||||
anim('\treconfiguration de %s' % borne.nom())
|
self.anim=anim('\treconfiguration de %s' % borne.nom())
|
||||||
# Il s'agit de faire l'union du répertoire common et du
|
# Il s'agit de faire l'union du répertoire common et du
|
||||||
# répertoire propre (s'il existe) ou alors du répertoire default
|
# répertoire propre (s'il existe) ou alors du répertoire default
|
||||||
# On supprime le répertoire de travail
|
# On supprime le répertoire de travail
|
||||||
|
@ -122,15 +123,17 @@ NVRAM_wl0_radio=%(ON)d
|
||||||
os.rename("%s/%s.tmp.tar.gz" % (TARGET, borne.nom()),
|
os.rename("%s/%s.tmp.tar.gz" % (TARGET, borne.nom()),
|
||||||
"%s/%s.tar.gz" % (TARGET, borne.nom()))
|
"%s/%s.tar.gz" % (TARGET, borne.nom()))
|
||||||
print OK
|
print OK
|
||||||
|
self.anim=anim('\tfin reconfigurations')
|
||||||
|
|
||||||
def gen_macip(self, clients, bornes):
|
def gen_macip(self, clients, bornes):
|
||||||
"""Génération de la correspondance MAC/IP"""
|
"""Génération de la correspondance MAC/IP"""
|
||||||
anim('\tFichier MAC/IP')
|
self.anim=anim('\r\tFichier MAC/IP',len(clients + bornes))
|
||||||
fd = file(self.MACIP, "w")
|
fd = file(self.MACIP, "w")
|
||||||
for machine in clients + bornes:
|
for machine in clients + bornes:
|
||||||
self.anim.cycle()
|
self.anim.cycle()
|
||||||
if 'bloq' in machine.blacklist_actif() : continue
|
if 'bloq' in machine.blacklist_actif() : continue
|
||||||
fd.write("%s %s\n" % (machine.mac(), machine.ip()))
|
fd.write("%s %s\n" % (machine.mac(), machine.ip()))
|
||||||
|
self.anim.reinit()
|
||||||
print OK
|
print OK
|
||||||
|
|
||||||
def gen_isakmpd(self, clients):
|
def gen_isakmpd(self, clients):
|
||||||
|
@ -206,7 +209,7 @@ Netmask= 0.0.0.0
|
||||||
phase1 = phase1_debut
|
phase1 = phase1_debut
|
||||||
phase2 = phase2_debut
|
phase2 = phase2_debut
|
||||||
blocs=''
|
blocs=''
|
||||||
anim('\tFichier isakmpd.conf')
|
self.anim=anim('\r\tFichier isakmpd.conf',len(clients))
|
||||||
for machine in clients :
|
for machine in clients :
|
||||||
self.anim.cycle()
|
self.anim.cycle()
|
||||||
if 'bloq' in machine.blacklist_actif() : continue
|
if 'bloq' in machine.blacklist_actif() : continue
|
||||||
|
@ -236,4 +239,5 @@ Netmask= 0.0.0.0
|
||||||
fd.write(blocs)
|
fd.write(blocs)
|
||||||
fd.write(net_crans)
|
fd.write(net_crans)
|
||||||
fd.close()
|
fd.close()
|
||||||
|
self.anim.reinit()
|
||||||
print OK
|
print OK
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue