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

rids/nets: shrink bornes à /27 + ajout plage ipv6

Browse source 
Faudra valider en IN si on garde cette plage ou non ...
This commit is contained in:
Daniel STAN 2015-03-23 20:16:08 +01:00
parent 9824bb160a
commit d6b359e717
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
gestion/config/config.py
View file

@ -222,8 +222,16 @@ plage_ens = '138.231.0.0/16'
NETs_primaires = {
'serveurs' : ['138.231.136.0/24'],
'adherents' : ['138.231.137.0/24', '138.231.138.0/23', '138.231.140.0/22'],
'wifi-adh' : ['138.231.144.0/22', '138.231.148.128/25', '138.231.149.0/24', '138.231.150.0/23'],
'bornes' : ['138.231.148.0/25'],
'wifi-adh' : ['138.231.144.0/22',
'138.231.148.32/27',
'138.231.148.64/26',
'138.231.148.128/25',
'138.231.149.0/24',
'138.231.150.0/23',
],
'bornes' : [
'138.231.148.0/27',
],
'adm' : ['10.231.136.0/24'],
'personnel-ens' : ['10.2.9.0/24'],
'gratuit' : ['10.42.0.0/16'],
@ -251,15 +259,16 @@ NETs_regexp = { 'all' : '^138\.231\.1(3[6789]|4[0123456789]|5[01])\.\d+$' }
# ci-dessus...
# De même que pout NETs, primaires c'est pour la bijectivité, et secondaires
# pour les trucs pratiques
# https://wiki.crans.org/CransTechnique/PlanAdressage#Machines
rid_primaires = {
# Rid pour les serveurs
'serveurs' : [(0, 255),],
# Rid pour les machines fixes
'adherents' : [(256, 2047),],
# Rid pour les machines wifi
'wifi-adh' : [(2048, 3071), (3200, 4095),],
'wifi-adh' : [(2048, 3071), (3104, 4095),],
# Rid pour les bornes
'bornes' : [(3072, 3199),],
'bornes' : [(3072, 3103), (34816, 35071),],
# Rid pour machines spéciales
'special' : [(4096, 6143),],
# Rid pour les serveurs v6-only
@ -285,7 +294,7 @@ rid_primaires = {
rid_secondaires = {
# Rid pour les machines filaire ipv4
'fil' : [(0, 2047),],
'wifi' : [(2048, 4095),],
'wifi' : [(2048, 4095), (34816, 35071),],
}
rid = {}