diff --git a/gestion/config.py b/gestion/config.py index f7108561..a548469e 100644 --- a/gestion/config.py +++ b/gestion/config.py @@ -319,9 +319,7 @@ Message cr # faire en sorte qu'ils prennent effet immédiatement ; c'est important pour # komaz car c'est la route par défaut mais aussi pour zamok et sila # à cause de leur firewall et de leur patte wifi. -NETs = { 'wifi' : [ '138.231.149.0/24', '138.231.150.0/24' ], - 'wifi-ens' : [ '138.231.151.0/25' ], - 'wifi-invite' : [ '138.231.151.128/25'], # inutilisé +NETs = { 'serveurs' : [ '138.231.136.0/28' ], 'b' : [ '138.231.137.0/24' ], 'm' : [ '138.231.138.0/24' ], 'c' : [ '138.231.139.0/24' ], @@ -332,8 +330,15 @@ NETs = { 'wifi' : [ '138.231.149.0/24', '138.231.150.0/24' ], 'i' : [ '138.231.142.0/25' ], 'j' : [ '138.231.142.128/25'], 'h' : [ '138.231.143.0/24' ], - 'all' : [ '138.231.136.0/21', '138.231.148.0/22' ], - 'bornes' : [ '138.231.148.0/24' ] } + 'vlan-adm' : [ '138.231.144.0/24' ], + 'bornes' : [ '138.231.148.0/24' ], + 'wifi-adh' : [ '138.231.149.0/24', '138.231.150.0/24' ], + 'wifi-ens' : [ '138.231.151.0/25' ], + 'wifi-invite' : [ '138.231.151.128/25'], # inutilisé + 'fil' : [ '138.231.136.0/21' ], + 'wifi': [ '138.231.148.0/22' ], + 'all' : [ '138.231.136.0/21', '138.231.148.0/22' ] + } NETs_regexp = { 'all' : '^138\.231\.1(3[6789]|4[0123456789]|5[01])\.\d+$' }