From: Thomas Pérennou (Viveris Technologie) Date: Wed, 18 Feb 2015 16:25:10 +0000 (+0100) Subject: Merge branch 'master' into 1060_swm_suppression X-Git-Tag: debian_7.8.1~9 X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=db490f01bd6546802af2eec878abdbf762adeeaa;hp=8d6c9e9b248e4f583ed40bbcb4d923d2d2048ed3;p=debian6500.git Merge branch 'master' into 1060_swm_suppression --- diff --git a/master/etc/hosts.12MHzDF b/master/etc/hosts.12MHzDF index b15f044..a6bed03 100644 --- a/master/etc/hosts.12MHzDF +++ b/master/etc/hosts.12MHzDF @@ -12,24 +12,24 @@ ff02::3 ip6-allhosts # Reseau 10.133.26.0 # =============================== -10.133.26.160 trc00-rf maitre-rf sup-rf fusion-rf enr00-rf -10.133.26.161 trc01-rf lsu-rf -10.133.26.162 trc02-rf gon00-rf -10.133.26.163 trc03-rf gon01-rf -10.133.26.164 trc04-rf gon02-rf -10.133.26.165 trc05-rf gon03-rf -10.133.26.166 trc06-rf gon04-rf -10.133.26.167 trc07-rf gon05-rf -10.133.26.168 trc08-rf gon06-rf -10.133.26.169 trc09-rf gon07-rf -10.133.26.170 trc10-rf gon08-rf -10.133.26.171 trc11-rf gon09-rf -10.133.26.172 trc12-rf gon10-rf -10.133.26.173 trc13-rf gon11-rf -10.133.26.174 trc14-rf gon12-rf -10.133.26.175 trc15-rf gon13-rf -10.133.26.176 trc16-rf gon14-rf -10.133.26.177 trc17-rf gon15-rf +10.133.26.160 trc00 maitre sup fusion enr00 nfsserver +10.133.26.161 trc01 lsu +10.133.26.162 trc02 gon00 +10.133.26.163 trc03 gon01 +10.133.26.164 trc04 gon02 +10.133.26.165 trc05 gon03 +10.133.26.166 trc06 gon04 +10.133.26.167 trc07 gon05 +10.133.26.168 trc08 gon06 +10.133.26.169 trc09 gon07 +10.133.26.170 trc10 gon08 +10.133.26.171 trc11 gon09 +10.133.26.172 trc12 gon10 +10.133.26.173 trc13 gon11 +10.133.26.174 trc14 gon12 +10.133.26.175 trc15 gon13 +10.133.26.176 trc16 gon14 +10.133.26.177 trc17 gon15 10.133.26.231 swg swg1 @@ -38,38 +38,19 @@ ff02::3 ip6-allhosts # =============================== # prod fe306 1 110->118 -10.133.28.110 fe306-1 +10.133.26.110 fe306-1 # prod fe306 2 120->1285 -10.133.28.120 fe306-2 +10.133.26.120 fe306-2 # prod fe306 3 130->138 -10.133.28.130 fe306-3 +10.133.26.130 fe306-3 # prod fe306 4 140->148 -10.133.28.140 fe306-4 +10.133.26.140 fe306-4 # prod fe306 5 150->158 -10.133.28.150 fe306-5 +10.133.26.150 fe306-5 10.133.28.159 amm00 10.133.28.158 amm01 -10.133.28.160 trc00 maitre sup fusion nfsserver -10.133.28.161 trc01 lsu -10.133.28.162 trc02 gon00 -10.133.28.163 trc03 gon01 -10.133.28.164 trc04 gon02 -10.133.28.165 trc05 gon03 -10.133.28.166 trc06 gon04 -10.133.28.167 trc07 gon05 -10.133.28.168 trc08 gon06 -10.133.28.169 trc09 gon07 -10.133.28.170 trc10 gon08 -10.133.28.171 trc11 gon09 -10.133.28.172 trc12 gon10 -10.133.28.173 trc13 gon11 -10.133.28.174 trc14 gon12 -10.133.28.175 trc15 gon13 -10.133.28.176 trc16 gon14 -10.133.28.177 trc17 gon15 - 10.133.28.231 swm 10.133.28.253 matrix diff --git a/master/etc/network/interfaces b/master/etc/network/interfaces index 843ddaa..d10f3b0 100644 --- a/master/etc/network/interfaces +++ b/master/etc/network/interfaces @@ -13,6 +13,8 @@ iface eth0 inet static network 10.133.26.0 broadcast 10.133.26.255 pre-up ip addr flush dev eth0 + # FE306 authentification + post-up ip route add 238.0.0.0/24 dev eth0 # FE306 pano post-up ip route add 238.75.0.0/16 dev eth0 # FE306 WP channels @@ -20,7 +22,13 @@ iface eth0 inet static # => on met val de base vaut 224 (1110 0000) et mask a 224 (1110 0000) # => 2eme octet associe aux valeurs de 224 a 255 post-up ip route add 238.224.0.0/11 dev eth0 - + # FE306 RF channels + # Pour prod voie RF 2eme octet vaut 110X XX11 (cf. libfreqplan/freqplancommon.h) + # => on met val de base vaut 192 (1100 0000) et mask a 224 (1110 0000) + # => 2eme octet associe aux valeurs de 192 a 223 + post-up ip route add 238.192.0.0/11 dev eth0 + # Delay line + post-up ip route add 239.0.0.0/8 dev eth0 # The secondary network interface auto eth1 @@ -31,14 +39,5 @@ iface eth1 inet static broadcast 10.133.28.255 gateway 10.133.28.231 pre-up ip addr flush dev eth1 - # FE306 authentification - post-up ip route add 238.0.0.0/24 dev eth1 - # FE306 RF channels - # Pour prod voie RF 2eme octet vaut 110X XX11 (cf. libfreqplan/freqplancommon.h) - # => on met val de base vaut 192 (1100 0000) et mask a 224 (1110 0000) - # => 2eme octet associe aux valeurs de 192 a 223 - post-up ip route add 238.192.0.0/11 dev eth1 - # Delay line - post-up ip route add 239.0.0.0/8 dev eth1 # Sensor prod post-up ip route add 225.0.0.0/8 dev eth1 diff --git a/master/opt/cluster/slave/etc/network/interfaces b/master/opt/cluster/slave/etc/network/interfaces index 769f4e3..a5d335d 100644 --- a/master/opt/cluster/slave/etc/network/interfaces +++ b/master/opt/cluster/slave/etc/network/interfaces @@ -16,7 +16,13 @@ iface eth0 inet dhcp # => on met val de base vaut 224 (1110 0000) et mask a 224 (1110 0000) # => 2eme octet associe aux valeurs de 224 a 255 post-up ip route add 238.224.0.0/11 dev eth0 - + # FE306 RF channels + # Pour prod voie RF 2eme octet vaut 110X XX11 (cf. libfreqplan/freqplancommon.h) + # => on met val de base vaut 192 (1100 0000) et mask a 224 (1110 0000) + # => 2eme octet associe aux valeurs de 192 a 223 + post-up ip route add 238.192.0.0/11 dev eth0 + # Delay line + post-up ip route add 239.0.0.0/8 dev eth0 # The secondary network interface auto eth1 @@ -24,12 +30,5 @@ iface eth1 inet dhcp pre-up ip addr flush dev eth1 # FE306 authentification post-up ip route add 238.0.0.0/24 dev eth1 - # FE306 RF channels - # Pour prod voie RF 2eme octet vaut 110X XX11 (cf. libfreqplan/freqplancommon.h) - # => on met val de base vaut 192 (1100 0000) et mask a 224 (1110 0000) - # => 2eme octet associe aux valeurs de 192 a 223 - post-up ip route add 238.192.0.0/11 dev eth1 - # Delay line - post-up ip route add 239.0.0.0/8 dev eth1 # Sensor prod post-up ip route add 225.0.0.0/8 dev eth1 diff --git a/master/opt/tftp/swg1.txt b/master/opt/tftp/swg1.txt index b8d3c32..cec8626 100644 --- a/master/opt/tftp/swg1.txt +++ b/master/opt/tftp/swg1.txt @@ -1,7 +1,6 @@ ! -! Last configuration change at 08:13:53 UTC Wed Jun 12 2013 -! NVRAM config last updated at 08:21:36 UTC Wed Jun 12 2013 +! Last configuration change at 14:10:07 UTC Thu Feb 12 2015 ! version 12.2 no service pad @@ -11,7 +10,7 @@ service password-encryption service compress-config service sequence-numbers ! -hostname SWG1 +hostname SWG ! boot-start-marker boot system flash bootflash:cat4500-ipbase-mz.122-54.SG1.bin @@ -22,7 +21,7 @@ enable secret 5 $1$OMTZ$xM5SrEPag4m7MGrV1u86/0 ! ! macro name VERSION -macro description 2.3 +macro description 2.3 full-duplex @ ! no aaa new-model @@ -32,7 +31,6 @@ no ip domain-lookup ! ip vrf mgmtVrf ! -ip routing ip multicast-routing ip igmp snooping vlan 1 immediate-leave vtp mode transparent @@ -49,9 +47,6 @@ vlan internal allocation policy ascending ! ! ! -interface Port-channel1 - switchport -! interface FastEthernet1 ip vrf forwarding mgmtVrf no ip address @@ -59,263 +54,251 @@ interface FastEthernet1 duplex auto ! interface GigabitEthernet1/1 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/2 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/3 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/4 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/5 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/6 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/7 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/8 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/9 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/10 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/11 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/12 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/13 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/14 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/15 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/16 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/17 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/18 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/19 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/20 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/21 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/22 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/23 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/24 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/25 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/26 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/27 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/28 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/29 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/30 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/31 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/32 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/33 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/34 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/35 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/36 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/37 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/38 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/39 - speed auto - duplex auto + load-interval 30 + duplex full spanning-tree portfast ! interface GigabitEthernet1/40 - speed auto - duplex auto + load-interval 30 + speed 100 + duplex full spanning-tree portfast ! interface GigabitEthernet1/41 - speed auto - duplex auto + load-interval 30 + speed 100 + duplex full spanning-tree portfast ! interface GigabitEthernet1/42 - speed auto - duplex auto + load-interval 30 + speed 100 + duplex full spanning-tree portfast ! interface GigabitEthernet1/43 - speed auto - duplex auto + load-interval 30 + speed 100 + duplex full spanning-tree portfast ! interface GigabitEthernet1/44 - speed auto - duplex auto + load-interval 30 + speed 100 + duplex full spanning-tree portfast ! interface GigabitEthernet1/45 + load-interval 30 media-type rj45 - speed auto - duplex auto + duplex full spanning-tree portfast ! interface GigabitEthernet1/46 + load-interval 30 media-type rj45 - speed auto - duplex auto spanning-tree portfast ! interface GigabitEthernet1/47 + load-interval 30 media-type rj45 - speed auto - duplex auto spanning-tree portfast ! interface GigabitEthernet1/48 + load-interval 30 media-type rj45 - speed auto - duplex auto spanning-tree portfast ! -interface TenGigabitEthernet1/49 - channel-protocol pagp - channel-group 1 mode desirable -! -interface TenGigabitEthernet1/50 - channel-protocol pagp - channel-group 1 mode desirable -! -interface TenGigabitEthernet1/51 - channel-protocol pagp - channel-group 1 mode desirable -! -interface TenGigabitEthernet1/52 -! interface Vlan1 ip address 10.133.26.231 255.255.255.0 ip pim dense-mode @@ -324,6 +307,8 @@ ip http server ip pim rp-address 10.133.26.231 ! ! +! +! control-plane ! ! @@ -339,8 +324,8 @@ line vty 5 15 password 7 120D0D161E0E1F login ! -ntp clock-period 17179537 +ntp clock-period 17179594 +ntp server 10.133.28.254 ntp server 10.133.26.160 ntp server 10.133.28.160 -ntp server 10.133.28.254 end