From c4d84a214c65676586681db1d643f57b8df1dcbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= Date: Wed, 20 Jun 2012 12:17:17 +0200 Subject: [PATCH] =?UTF-8?q?[/usr/scripts/]=20Ajout=20de=20charybde=20?= =?UTF-8?q?=C3=A0=20la=20place=20de=20sila?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ignore-this: a8a39ec418d9c537f5c2824ff38b6251 darcs-hash:20120620101717-b6762-2ce7750aab12c0aa77fd743e8c03710e71cd5ed0.gz --- gestion/gen_confs/dhcpd.py | 4 ++-- gestion/gen_confs/firewall.py | 6 +++--- gestion/gen_confs/firewall_new.py | 6 +++--- gestion/gen_confs/switchs.py | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gestion/gen_confs/dhcpd.py b/gestion/gen_confs/dhcpd.py index 43049d65..31b29995 100644 --- a/gestion/gen_confs/dhcpd.py +++ b/gestion/gen_confs/dhcpd.py @@ -77,7 +77,7 @@ subnet 10.52.0.0 netmask 255.255.0.0 { # if hostname == 'zamok': # reseaux = { '138.231.136.0/21' : #"""option routers 138.231.136.4; -# option domain-name-servers 138.231.136.3, 138.231.136.9, 138.231.136.10; +# option domain-name-servers 138.231.136.3, 138.231.136.9, 138.231.136.98; # option domain-name "crans.org"; # option option-119 "crans.org wifi.crans.org";""" } if hostname == 'ragnarok': @@ -94,7 +94,7 @@ subnet 10.52.0.0 netmask 255.255.0.0 { reseaux = { '138.231.136.0/21' : """authoritative; option routers 138.231.136.4; - option domain-name-servers 138.231.136.9, 138.231.136.10, 138.231.136.3; + option domain-name-servers 138.231.136.9, 138.231.136.98, 138.231.136.3; option domain-name "crans.org"; option option-119 "crans.org wifi.crans.org"; filename "pxelinux.0"; diff --git a/gestion/gen_confs/firewall.py b/gestion/gen_confs/firewall.py index 330c1206..cd030fb0 100644 --- a/gestion/gen_confs/firewall.py +++ b/gestion/gen_confs/firewall.py @@ -528,9 +528,9 @@ class firewall_komaz(firewall_crans) : eth_int = self.eth_int # Classification du traffic : extérieur <-> ftp - iptables("-t mangle -A POSTROUTING -o %(eth_int)s -d 136.231.136.10 " + iptables("-t mangle -A POSTROUTING -o %(eth_int)s -d 136.231.136.98 " "-j CLASSIFY --set-class 1:9997" % locals()) - iptables("-t mangle -A POSTROUTING -o %(eth_ext)s -s 136.231.136.10 " + iptables("-t mangle -A POSTROUTING -o %(eth_ext)s -s 136.231.136.98 " "-j CLASSIFY --set-class 1:9997" % locals()) # On ne va pas plus loin si il ne s'agit pas de bittorrent @@ -626,7 +626,7 @@ class firewall_komaz(firewall_crans) : # bande passante. # Classification des paquets à destination du ftp - iptables("-t mangle -A POSTROUTING -o %(eth_int)s -p tcp -d 136.231.136.10 --dport 21 " + iptables("-t mangle -A POSTROUTING -o %(eth_int)s -p tcp -d 136.231.136.98 --dport 21 " "-j CLASSIFY --set-class 1:9997" % locals()) self.anim.reinit() diff --git a/gestion/gen_confs/firewall_new.py b/gestion/gen_confs/firewall_new.py index 5699a964..9c96de9c 100755 --- a/gestion/gen_confs/firewall_new.py +++ b/gestion/gen_confs/firewall_new.py @@ -522,9 +522,9 @@ class firewall_komaz(firewall_crans) : eth_int = self.eth_int # Classification du traffic : extérieur <-> ftp - iptables("-t mangle -A POSTROUTING -o %(eth_int)s -d 138.231.136.10 " + iptables("-t mangle -A POSTROUTING -o %(eth_int)s -d 138.231.136.98 " "-j CLASSIFY --set-class 1:9997" % locals()) - iptables("-t mangle -A POSTROUTING -o %(eth_ext)s -s 138.231.136.10 " + iptables("-t mangle -A POSTROUTING -o %(eth_ext)s -s 138.231.136.98 " "-j CLASSIFY --set-class 1:9997" % locals()) # On marque les paquets bittorrent uniquement @@ -645,7 +645,7 @@ class firewall_komaz(firewall_crans) : # bande passante. # Classification des paquets à destination du ftp - iptables("-t mangle -A POSTROUTING -o %(eth_int)s -p tcp -d 138.231.136.10 --dport 21 " + iptables("-t mangle -A POSTROUTING -o %(eth_int)s -p tcp -d 138.231.136.98 --dport 21 " "-j CLASSIFY --set-class 1:9997" % locals()) self.anim.reinit() diff --git a/gestion/gen_confs/switchs.py b/gestion/gen_confs/switchs.py index daf2dd59..a20b614c 100644 --- a/gestion/gen_confs/switchs.py +++ b/gestion/gen_confs/switchs.py @@ -65,7 +65,7 @@ snmp-server community "public" Operator ;-------------------------------------------------------- Heure/date time timezone 60 time daylight-time-rule Western-Europe -sntp server 10.231.136.10 +sntp server 10.231.136.98 timesync sntp sntp unicast ;-------------------------------------------------------- Misc