Merge branch 'master' of ssh://srvgitgnv/gitstore/g_tr65/debian6500

diff --combined master/opt/tftp/swg1.txt
index 77dd38db8c3239e13bd7f001deb69a840ae33555,b8d3c32f99decf6888ce6ed303ffaa64b9cd1cba..1fc0598fb9da259e5953fdd04f625a8fe1775fe7
--- 1/master/opt/tftp/swg1.txt
--- 2/master/opt/tftp/swg1.txt
+++ b/master/opt/tftp/swg1.txt
@@@ -22,7 -22,7 +22,7 @@@ enable secret 5 $1$OMTZ$xM5SrEPag4m7MGr
  !
  !
  macro name VERSION
 -macro description 2.3
 +macro description 2.3 full-duplex
  @
  !
  no aaa new-model
@@@ -47,9 -47,6 +47,9 @@@ spanning-tree extend system-i
  !
  vlan internal allocation policy ascending
  !
 +vlan 10
 + name INFORMATION-SYSTEM
 +!
  !
  !
  interface Port-channel1
@@@ -63,222 -60,222 +63,222 @@@ interface FastEthernet
  !
  interface GigabitEthernet1/1
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/2
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/3
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/4
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/5
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/6
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/7
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/8
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/9
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/10
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/11
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/12
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/13
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/14
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/15
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/16
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/17
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/18
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/19
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/20
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/21
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/22
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/23
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/24
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/25
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/26
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/27
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/28
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/29
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/30
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/31
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/32
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/33
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/34
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/35
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/36
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/37
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/38
   speed auto
-  duplex full
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/39
-  speed 100
-  duplex full
+  speed auto
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/40
-  speed 100
-  duplex full
+  speed auto
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/41
-  speed 100
-  duplex full
+  speed auto
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/42
-  speed 100
-  duplex full
+  speed auto
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/43
-  speed 100
-  duplex full
+  speed auto
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/44
-  speed 100
-  duplex full
+  speed auto
+  duplex auto
   spanning-tree portfast
  !
  interface GigabitEthernet1/45
@@@ -300,8 -297,6 +300,6 @@@ interface GigabitEthernet1/4
   spanning-tree portfast
  !
  interface GigabitEthernet1/48
-  switchport access vlan 10
-  switchport mode access
   media-type rj45
   speed auto
   duplex auto
@@@ -320,30 -315,18 +318,20 @@@ interface TenGigabitEthernet1/5
   channel-group 1 mode desirable
  !
  interface TenGigabitEthernet1/52
 + switchport access vlan 10
 + switchport mode access
  !
  interface Vlan1
   ip address 10.133.26.231 255.255.255.0
   ip pim dense-mode
  !
- interface Vlan10
-  ip address 100.100.100.100 255.255.255.0
-  ip pim sparse-mode
- !
- ip forward-protocol udp echo
- ip route 0.0.0.0 0.0.0.0 100.100.100.101
  ip http server
  ip pim rp-address 10.133.26.231
  !
- access-list 101 permit udp host 10.133.26.160 any eq echo
  !
  control-plane
  !
  !
- snmp-server community public RO
- !
- !
  line con 0
   password 7 01070E05570E15
   logging synchronous
@@@ -356,7 -339,8 +344,8 @@@ line vty 5 1
   password 7 120D0D161E0E1F
   login
  !
- ntp clock-period 17179594
- ntp server 10.133.26.254
+ ntp clock-period 17179537
  ntp server 10.133.26.160
+ ntp server 10.133.28.160
+ ntp server 10.133.28.254
  end