From e236f41035e7d04ca409519e369ded308eacb7e2 Mon Sep 17 00:00:00 2001 From: bernat Date: Thu, 21 Apr 2005 12:07:19 +0200 Subject: [PATCH] Detabification darcs-hash:20050421100719-d1718-6dc337636c37181ae4af40fb0fde44cc21b6a751.gz --- gestion/gen_confs/dhcpd.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gestion/gen_confs/dhcpd.py b/gestion/gen_confs/dhcpd.py index b68573f8..78db254d 100755 --- a/gestion/gen_confs/dhcpd.py +++ b/gestion/gen_confs/dhcpd.py @@ -63,9 +63,9 @@ subnet %(network)s netmask %(netmask)s { host_template=""" host %(nom)s { - hardware ethernet %(mac)s; - fixed-address %(ip)s; - option host-name "%(nom)s"; + hardware ethernet %(mac)s; + fixed-address %(ip)s; + option host-name "%(nom)s"; } """ @@ -84,31 +84,31 @@ subnet %(network)s netmask %(netmask)s { ######################################FIN PARTIE DE CONFIGURATION def __str__(self) : - return 'dhcp' + return 'dhcp' def _gen(self) : warnings ='' ### Construction de la partie du fichier contenant les machines hosts={} - - self.anim.iter=len(self.machines) - for machine in self.machines : - self.anim.cycle() - t = 0 - for net in self.reseaux.keys() : - if AddrInNet(machine.ip(),net) : - d = { 'nom' : machine.nom().split('.')[0] , 'mac' : machine.mac() , 'ip' : machine.ip() } - try : hosts[net] += self.host_template % d - except : hosts[net] = self.host_template % d - t = 1 + + self.anim.iter=len(self.machines) + for machine in self.machines : + self.anim.cycle() + t = 0 + for net in self.reseaux.keys() : + if AddrInNet(machine.ip(),net) : + d = { 'nom' : machine.nom().split('.')[0] , 'mac' : machine.mac() , 'ip' : machine.ip() } + try : hosts[net] += self.host_template % d + except : hosts[net] = self.host_template % d + t = 1 ### Ecriture du fichier fd = self._open_conf(self.DHCPD_CONF,'#') for net, options in self.reseaux.items() : if not hosts.has_key(net) : - warnings += u'Réseau %s ignoré : aucune machine à servir\n' % net - continue + warnings += u'Réseau %s ignoré : aucune machine à servir\n' % net + continue d = param(net) d['OPTIONS_RESEAU'] = options d['HOSTs'] = hosts[net] @@ -117,4 +117,4 @@ subnet %(network)s netmask %(netmask)s { fd.close() - return warnings + return warnings