From 61d31e04a0b4531a3dbd57972da25eb03a07f739 Mon Sep 17 00:00:00 2001 From: Antoine Durand-Gasselin Date: Mon, 9 Nov 2009 03:50:48 +0100 Subject: [PATCH] [config,gen_confs] gordon est le nouveau routeur wifi darcs-hash:20091109025048-bd074-5097aaa6617c1278171ee4693f47cb79e60eb2bf.gz --- gestion/config.py | 2 +- gestion/gen_confs/dhcpd_new.py | 3 +++ gestion/gen_confs/generate.py | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gestion/config.py b/gestion/config.py index 66873817..d42c1552 100644 --- a/gestion/config.py +++ b/gestion/config.py @@ -42,7 +42,7 @@ cimetiere = '/home/cimetiere' ## Adresses mac utiles mac_komaz = '00:19:BB:31:3B:80' -mac_wifi = '00:e0:81:58:d1:39' +mac_wifi = '00:0f:1f:66:e0:e8' mac_titanic = 'aa:73:65:63:6f:76' ## Serveur principal de bcfg2 diff --git a/gestion/gen_confs/dhcpd_new.py b/gestion/gen_confs/dhcpd_new.py index 93c6a4f5..8c1452d8 100755 --- a/gestion/gen_confs/dhcpd_new.py +++ b/gestion/gen_confs/dhcpd_new.py @@ -28,6 +28,9 @@ class dhcp(gen_config) : elif hostname == 'titanic': restart_cmd = '/etc/init.d/dhcp3-server restart' reseaux = { '10.2.9.0/24' : '/etc/dhcp3/generated/appartements.liste' } + elif hostname == 'gordon': + restart_cmd = '/etc/init.d/dhcp3-server restart' + reseaux = { '138.231.144.0/21' : '/etc/dhcp3/generated/wifi.liste' } host_template = """ host %(nom)s { diff --git a/gestion/gen_confs/generate.py b/gestion/gen_confs/generate.py index 98b2ff35..f20064f5 100644 --- a/gestion/gen_confs/generate.py +++ b/gestion/gen_confs/generate.py @@ -289,6 +289,13 @@ class ragnarok(base_reconfigure): from gen_confs.droits import droits_openbsd self._do(droits_openbsd()) +class gordon(base_reconfigure) : + def dhcp(self): + from gen_confs.dhcpd_new import dhcp + self._do(dhcp(), self._machines()) + + + class vert(base_reconfigure): def home(self, args): from adherents import home