From 5f9ee2e593de13f10c4b0efc79e14343d7b72c27 Mon Sep 17 00:00:00 2001
From: Daniel STAN <daniel.stan@crans.org>
Date: Sun, 24 Aug 2014 15:41:07 +0200
Subject: [PATCH] migration komaz->odlyd

---
 gestion/config/config.py                 | 2 +-
 gestion/config/firewall.py               | 8 ++++++++
 gestion/gen_confs/firewall4/firewall4.py | 1 +
 gestion/gen_confs/firewall4/komaz.py     | 2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/gestion/config/config.py b/gestion/config/config.py
index b6676898..03844b54 100644
--- a/gestion/config/config.py
+++ b/gestion/config/config.py
@@ -144,7 +144,7 @@ droits_mailing_listes = {'roots' : [ u'Nounou', u'Apprenti'],
 cimetiere = '/home/cimetiere'
 
 #: Adresses mac utiles
-mac_komaz = '00:19:BB:31:3B:80'
+mac_komaz = 'a0:d3:c1:00:f4:04'
 mac_wifi = '00:0f:1f:66:e0:e8'
 mac_titanic = 'aa:73:65:63:6f:76'
 
diff --git a/gestion/config/firewall.py b/gestion/config/firewall.py
index fa5746db..129bea5c 100644
--- a/gestion/config/firewall.py
+++ b/gestion/config/firewall.py
@@ -16,6 +16,14 @@ dev = {
         'adm' : 'crans.2',
         'tun-ovh' : 'tun-ovh'
     },
+    'odlyd': {
+        'out' : 'ens',
+        'wifi' : 'crans.3',
+        'fil' : 'crans',
+        'app' : 'crans.21',
+        'adm' : 'crans.2',
+        'tun-ovh' : 'tun-ovh'
+    },
     'zamok': {
         'fil' : 'crans',
         'adm' : 'crans.2'
diff --git a/gestion/gen_confs/firewall4/firewall4.py b/gestion/gen_confs/firewall4/firewall4.py
index 40a8801e..dae05fd0 100755
--- a/gestion/gen_confs/firewall4/firewall4.py
+++ b/gestion/gen_confs/firewall4/firewall4.py
@@ -18,6 +18,7 @@ hostname = socket.gethostname()
 #: Associe à un ``hostname`` la classe du pare-feu correspondant
 firewall = {
     'komaz' : komaz.firewall,
+    'odlyd' : komaz.firewall,
     'zamok' : zamok.firewall,
     'routeur' : routeur.firewall,
     'gordon' : base.firewall_routeur,
diff --git a/gestion/gen_confs/firewall4/komaz.py b/gestion/gen_confs/firewall4/komaz.py
index f84dd765..4f13244f 100644
--- a/gestion/gen_confs/firewall4/komaz.py
+++ b/gestion/gen_confs/firewall4/komaz.py
@@ -534,7 +534,7 @@ class firewall(base.firewall_routeur):
             for int_key in ['app']:
                 try:
                     utils.tc('qdisc del dev %s root' % dev[int_key])
-                except TcError:
+                except utils.TcError:
                     pass
                 utils.tc('qdisc add dev %s root handle 1: htb r2q 1' % dev[int_key])