diff --git a/switch-configs/coresw.cfg b/switch-configs/coresw.cfg index 8a76772..233fce6 100644 --- a/switch-configs/coresw.cfg +++ b/switch-configs/coresw.cfg @@ -161,7 +161,7 @@ interface range GigabitEthernet0/11-16 interface range GigabitEthernet0/17-18 description OVERFLOW switchport access vlan 24 - switcport mode access + switchport mode access no cdp enable spanning-tree portfast trunk no shutdown @@ -186,16 +186,16 @@ interface GigabitEthernet0/44 ! interface GigabitEthernet0/45 description eric2/standby - switchport trunk enacapsulation dot1q - switchport trunk alliwed vlan 2,10,20-25 + switchport trunk encapsulation dot1q + switchport trunk allowed vlan 2,10,20-25 switchport mode trunk no cdp enable spanning-tree portfast trunk ! interface GigabitEthernet0/46 description eric - switchport trunk enacapsulation dot1q - switchport trunk alliwed vlan 2,10,20-25 + switchport trunk encapsulation dot1q + switchport trunk allowed vlan 2,10,20-25 switchport mode trunk no cdp enable spanning-tree portfast trunk diff --git a/switch-configs/receptionsw.cfg b/switch-configs/receptionsw.cfg index 5586431..5417ddf 100644 --- a/switch-configs/receptionsw.cfg +++ b/switch-configs/receptionsw.cfg @@ -89,24 +89,21 @@ interface gigabitEthernet 1/0/2 # interface gigabitEthernet 1/0/3 - switchport mode trunk - switchport trunk allowed vlan 21,25 + switchport access vlan 21 spanning-tree spanning-tree common-config portfast enable description "reception/pc1" # interface gigabitEthernet 1/0/4 - switchport mode trunk - switchport trunk allowed vlan 21,25 + switchport access vlan 21 spanning-tree spanning-tree common-config portfast enable description "reception/pc2" # interface gigabitEthernet 1/0/5 - switchport mode trunk - switchport trunk allowed vlan 21,25 + switchport access vlan 21 spanning-tree spanning-tree common-config portfast enable description "reception/pc3" diff --git a/switch-configs/regen.sh b/switch-configs/regen.sh index ae4c241..904888e 100644 --- a/switch-configs/regen.sh +++ b/switch-configs/regen.sh @@ -15,6 +15,8 @@ BASEDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" source ${BASEDIR}/secrets.conf +rm -f *_compiled.cfg + for _config in $(ls -1 ${BASEDIR}/*.cfg) ; do sed \ -e "s/@PW@/${ACCESS_PW}/g" \