From 34876f3b5517ff975b7f84760a73af8a742f44ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Sun, 26 Oct 2014 17:05:46 +0100
Subject: [PATCH] Le routeur n'est plus komaz mais odlyd

---
 Python/etc/hosts          |  4 +---
 Python/etc/monit/services |  6 +++---
 etc/python/ip.py          | 34 +++++++++++++++++-----------------
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/Python/etc/hosts b/Python/etc/hosts
index 4531931..fac2ba2 100644
--- a/Python/etc/hosts
+++ b/Python/etc/hosts
@@ -16,9 +16,7 @@ else:
 if has("vlan-wifi"):
     print wifiip(), wifihostname, hostname+".wifi"
 @10.231.136.7 zbee.adm.crans.org zbee.adm zbee nfs.adm.crans.org nfs.adm nfs
-if(has("komaz")):
-	print "138.231.135.5 irts-ext.ens-cachan.fr irts"
-	print "138.231.135.6 komaz-ext"
+if(has("odlyd")):
 	print "138.231.136.9 sable.crans.org sable"
 	print "138.231.136.98 charybde.crans.org charybde"
 
diff --git a/Python/etc/monit/services b/Python/etc/monit/services
index 4017a90..9729762 100644
--- a/Python/etc/monit/services
+++ b/Python/etc/monit/services
@@ -213,14 +213,14 @@ service("openvpn-ovh",
         pidf="openvpn.ovh",
         init="openvpn")
 
-service("openvpn-komaz",
-        pidf="openvpn.komaz",
+service("openvpn-odlyd",
+        pidf="openvpn.odlyd",
         init="openvpn")
 
 service("openvpn-freebox",
         pidf="openvpn.freebox",
         init="openvpn",
-        extra=["depends on openvpn-komaz"])
+        extra=["depends on openvpn-odlyd"])
 
 pg_version = '9.1'
 service("pgsql-server",
diff --git a/etc/python/ip.py b/etc/python/ip.py
index e443194..bba1914 100644
--- a/etc/python/ip.py
+++ b/etc/python/ip.py
@@ -28,9 +28,9 @@ def ips_of_metadata(clients, vlan='adm'):
     """Renvoie la liste des IPs des machines de la liste ``clients``
     #TODO: sur le vlan ``vlan``
     sur le vlan adm
-    
+
     Renvoie les Ipv4 et Ipv6.
-    
+
     ``clients`` est une liste de ClientMetadata, qui peut être obtenue via
     metadata.query.by_groups (ou similaire)
     """
@@ -77,7 +77,7 @@ ip_vlan = {
         'vlan-isolement':'10.52.0.10'
     },
     'titanic' : {'vlan-ens' : '10.2.9.1' },
-    'komaz' : {'vlan-ens' : '10.2.9.4' },
+    'odlyd' : {'vlan-ens' : '10.2.9.4' },
   }
 
 def radinip():
@@ -103,32 +103,32 @@ def isolementip():
         return ip_vlan[hostname]["vlan-isolement"]
     else:
         raise NotImplementedError, "Ce serveur n'a rien a faire sur le VLAN isolement"
- 
+
 def cidr_to_regex(cidr):
     """Get a ipv4 cidr string and return a regexp for it.
     https://chris-lamb.co.uk/posts/matching-ips-regexes-concidrd-harmful
     """
     ip, prefix = cidr.split('/')
- 
+
     base = 0
     for val in map(int, ip.split('.')):
         base = (base << 8) | val
- 
+
     shift = 32 - int(prefix)
     start = base >> shift << shift
     end = start | (1 << shift) - 1
- 
+
     def regex(lower, upper):
         if lower == upper:
             return str(lower)
- 
+
         from math import log10
         exp = int(log10(upper - lower))
         delta = 10 ** exp
- 
+
         if lower == 0 and upper == 255:
             return "\d+"
- 
+
         if delta == 1:
             val = ""
             for a, b in zip(str(lower), str(upper)):
@@ -141,22 +141,22 @@ def cidr_to_regex(cidr):
                 else:
                     val += '[%s-%s]' % (a, b)
             return val
- 
+
         def gen_classes():
             floor_ = lambda x: int(round(x / delta, 0) * delta)
- 
+
             xs = range(floor_(upper) - delta, floor_(lower), -delta)
             for x in map(str, xs):
                 yield '%s%s' % (x[:-exp], r'\d' * exp)
- 
+
             yield regex(lower, floor_(lower) + (delta - 1))
             yield regex(floor_(upper), upper)
- 
+
         return '|'.join(gen_classes())
- 
+
     def get_parts():
         for x in range(24, -1, -8):
             yield regex(start >> x & 255, end >> x & 255)
- 
+
     return '^%s$' % r'\.'.join(get_parts())
- 
+