On stabilise le plugin Python en virant toute occurrence de print.
* Désolé. \o/
This commit is contained in:
Pierre-Elliott Bécue
parent
2c27a030ee
commit
4b36a51d99
102 changed files with 513 additions and 703 deletions
|
|
@ -24,7 +24,7 @@ def dev(interface, mode, additionnals=[]):
|
|||
configured_ifaces.append(interface)
|
||||
|
||||
if mode == "pub":
|
||||
print """auto %(interface)s
|
||||
out("""auto %(interface)s
|
||||
iface %(interface)s inet static
|
||||
address %(ip)s
|
||||
network 138.231.136.0
|
||||
|
|
@ -33,16 +33,16 @@ iface %(interface)s inet static
|
|||
mtu 1496
|
||||
gateway 138.231.136.4
|
||||
dns-nameservers %(nameservers)s
|
||||
dns-search crans.org""" % { 'interface': interface, 'ip': pubip(), 'nameservers': ' '.join(config.dns.recursiv['fil']) }
|
||||
dns-search crans.org""" % { 'interface': interface, 'ip': pubip(), 'nameservers': ' '.join(config.dns.recursiv['fil']) })
|
||||
|
||||
for line in additionnals:
|
||||
print " ", line
|
||||
print
|
||||
out(" %s" % (line,))
|
||||
out()
|
||||
|
||||
pub6(interface)
|
||||
|
||||
elif mode == "wifi":
|
||||
print """auto %(interface)s
|
||||
out("""auto %(interface)s
|
||||
iface %(interface)s inet static
|
||||
address %(ip)s
|
||||
network 138.231.144.0
|
||||
|
|
@ -50,14 +50,14 @@ iface %(interface)s inet static
|
|||
broadcast 138.231.151.255
|
||||
mtu 1496
|
||||
dns-nameservers %(nameservers)s
|
||||
dns-search wifi.crans.org""" % { 'interface': interface, 'ip': wifiip(), 'nameservers': ' '.join(config.dns.recursiv['wifi']) }
|
||||
dns-search wifi.crans.org""" % { 'interface': interface, 'ip': wifiip(), 'nameservers': ' '.join(config.dns.recursiv['wifi']) })
|
||||
|
||||
for line in additionnals:
|
||||
print " ", line
|
||||
print
|
||||
out(" %s" % (line,))
|
||||
out()
|
||||
|
||||
elif mode == "adm":
|
||||
print """auto %(interface)s
|
||||
out("""auto %(interface)s
|
||||
iface %(interface)s inet static
|
||||
address %(ip)s
|
||||
network 10.231.136.0
|
||||
|
|
@ -65,64 +65,64 @@ iface %(interface)s inet static
|
|||
broadcast 10.231.136.255
|
||||
mtu 1496
|
||||
dns-nameservers %(nameservers)s
|
||||
dns-search adm.crans.org""" % { 'interface': interface, 'ip': admip(), 'nameservers': ' '.join(config.dns.recursiv['adm']) }
|
||||
dns-search adm.crans.org""" % { 'interface': interface, 'ip': admip(), 'nameservers': ' '.join(config.dns.recursiv['adm']) })
|
||||
|
||||
for line in additionnals:
|
||||
print " ", line
|
||||
print
|
||||
out(" %s" % (line,))
|
||||
out()
|
||||
|
||||
adm6(interface)
|
||||
|
||||
elif mode == "radin":
|
||||
print """auto %(interface)s
|
||||
out("""auto %(interface)s
|
||||
iface %(interface)s inet static
|
||||
address %(ip)s
|
||||
network 10.42.0.0
|
||||
netmask 255.255.0.0
|
||||
broadcast 10.42.255.255
|
||||
mtu 1496""" % { 'interface': interface, 'ip': radinip() }
|
||||
print
|
||||
mtu 1496""" % { 'interface': interface, 'ip': radinip() })
|
||||
out()
|
||||
radin6(interface)
|
||||
|
||||
elif mode == "accueil":
|
||||
print """auto %(interface)s
|
||||
out("""auto %(interface)s
|
||||
iface %(interface)s inet static
|
||||
address %(ip)s
|
||||
network 10.51.0.0
|
||||
netmask 255.255.0.0
|
||||
broadcast 10.51.255.255
|
||||
mtu 1496""" % { 'interface': interface, 'ip': accueilip() }
|
||||
mtu 1496""" % { 'interface': interface, 'ip': accueilip() })
|
||||
|
||||
elif mode == "ens":
|
||||
print """auto %(interface)s
|
||||
out("""auto %(interface)s
|
||||
iface %(interface)s inet static
|
||||
address %(ip)s
|
||||
network 10.2.9.0
|
||||
netmask 255.255.255.0
|
||||
broadcast 10.2.9.255
|
||||
mtu 1496""" % { 'interface': interface, 'ip': appt_ens_ip() }
|
||||
mtu 1496""" % { 'interface': interface, 'ip': appt_ens_ip() })
|
||||
|
||||
elif mode == "isolement":
|
||||
print """auto %(interface)s
|
||||
out("""auto %(interface)s
|
||||
iface %(interface)s inet static
|
||||
address %(ip)s
|
||||
network 10.52.0.0
|
||||
netmask 255.255.0.0
|
||||
broadcast 10.52.255.255
|
||||
mtu 1496""" % { 'interface': interface, 'ip': isolementip() }
|
||||
mtu 1496""" % { 'interface': interface, 'ip': isolementip() })
|
||||
|
||||
elif mode == "federez":
|
||||
print """auto %(interface)s
|
||||
out("""auto %(interface)s
|
||||
iface %(interface)s inet static
|
||||
address %(ip)s
|
||||
network 10.53.0.0
|
||||
netmask 255.255.0.0
|
||||
broadcast 10.53.255.255
|
||||
mtu 1496""" % { 'interface': interface, 'ip': federezip() }
|
||||
mtu 1496""" % { 'interface': interface, 'ip': federezip() })
|
||||
|
||||
elif mode == "manuel":
|
||||
print """auto %(interface)s
|
||||
iface %(interface)s inet static""" % { 'interface': interface }
|
||||
out("""auto %(interface)s
|
||||
iface %(interface)s inet static""" % { 'interface': interface })
|
||||
|
||||
elif mode == "vide":
|
||||
try:
|
||||
|
|
@ -130,34 +130,34 @@ iface %(interface)s inet static""" % { 'interface': interface }
|
|||
except ValueError:
|
||||
vlan = None
|
||||
if vlan:
|
||||
print """auto %(interface)s
|
||||
out("""auto %(interface)s
|
||||
iface %(interface)s inet manual
|
||||
pre-up vconfig add %(iface)s %(vlan)s
|
||||
post-down vconfig rem %(iface)s.%(vlan)s
|
||||
up ip l set %(interface)s up
|
||||
down ip l set %(interface)s down""" % { 'interface': interface, 'iface':iface,'vlan':vlan }
|
||||
down ip l set %(interface)s down""" % { 'interface': interface, 'iface':iface,'vlan':vlan })
|
||||
else:
|
||||
print """auto %(interface)s
|
||||
out("""auto %(interface)s
|
||||
iface %(interface)s inet manual
|
||||
up ip l set %(interface)s up
|
||||
down ip l set %(interface)s down""" % { 'interface': interface }
|
||||
down ip l set %(interface)s down""" % { 'interface': interface })
|
||||
|
||||
else:
|
||||
raise NotImplementedError, "Mode de reseau inconnu : %s" % mode
|
||||
|
||||
if mode != "pub" and mode != "adm" and mode != "wifi" :
|
||||
for line in additionnals:
|
||||
print " ", line
|
||||
print
|
||||
out(" %s" % (line,))
|
||||
out()
|
||||
|
||||
# Definitions communes
|
||||
print """auto lo
|
||||
out("""auto lo
|
||||
iface lo inet loopback
|
||||
"""
|
||||
""")
|
||||
|
||||
# Pour arpwatch, on surveille nos réseaux
|
||||
def otherlisteners():
|
||||
print "#Interfaces d'ecoute restantes pour arpwatch "
|
||||
out("#Interfaces d'ecoute restantes pour arpwatch")
|
||||
for vlan in watched_vlans:
|
||||
if vlan == 1:
|
||||
iface = 'eth0'
|
||||
|
|
@ -218,21 +218,21 @@ def interface6(interface, list_ip, mode = 'serveur'):
|
|||
|
||||
main_ip = list_ip[0]
|
||||
list_ip = list_ip[1:]
|
||||
print """iface %(interface)s inet6 static
|
||||
out("""iface %(interface)s inet6 static
|
||||
address %(ip6)s
|
||||
netmask %(netmask)s""" % {
|
||||
'interface': interface,
|
||||
'ip6': main_ip.split('/')[0],
|
||||
'netmask': (main_ip.split('/') + ['64'])[1],
|
||||
}
|
||||
})
|
||||
# Avoid loops
|
||||
if mode != 'routeur':
|
||||
print ' gateway fe80::1'
|
||||
out(' gateway fe80::1')
|
||||
for ip in list_ip:
|
||||
print ' up ip a add %s dev $IFACE' % ip
|
||||
print ' down ip a delete %s dev $IFACE' % ip
|
||||
print ' up /sbin/sysctl net/ipv6/conf/$IFACE/autoconf=0'
|
||||
print
|
||||
out(' up ip a add %s dev $IFACE' % (ip,))
|
||||
out(' down ip a delete %s dev $IFACE' % (ip,))
|
||||
out(' up /sbin/sysctl net/ipv6/conf/$IFACE/autoconf=0')
|
||||
out()
|
||||
|
||||
def pub6(interface, mode='serveur', list_ip=[]):
|
||||
list_ip = [pubip6(interface) + '/64'] + list_ip
|
||||
|
|
@ -249,16 +249,16 @@ def wifi6(interface, list_ip=[], name=None):
|
|||
interface6(interface, list_ip)
|
||||
|
||||
def adm6(interface):
|
||||
print """iface %(interface)s inet6 static
|
||||
out("""iface %(interface)s inet6 static
|
||||
address %(ip6)s
|
||||
netmask 64""" % { 'interface': interface, 'ip6': admip6(interface) }
|
||||
print
|
||||
netmask 64""" % { 'interface': interface, 'ip6': admip6(interface) })
|
||||
out()
|
||||
|
||||
def radin6(interface):
|
||||
print """iface %(interface)s inet6 static
|
||||
out("""iface %(interface)s inet6 static
|
||||
address %(ip6)s
|
||||
netmask 64""" % { 'interface': interface, 'ip6': radinip6(interface) }
|
||||
print
|
||||
netmask 64""" % { 'interface': interface, 'ip6': radinip6(interface) })
|
||||
out()
|
||||
|
||||
Probe_Mac = metadata.Probes["mac"].split('\n')
|
||||
If_Mac = dict(zip(Probe_Mac[:-1:2], Probe_Mac[1::2]))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue