Index: nodes/ZTWMeerburgkerk/meerburgkerk.txt =================================================================== --- nodes/ZTWMeerburgkerk/meerburgkerk.txt (revision 13678) +++ nodes/ZTWMeerburgkerk/meerburgkerk.txt (revision 13679) @@ -14,7 +14,7 @@ RG260GSP 2 ================ -vr1 - port 1 - ALIX - Intern - 4c:5e:0c:74:d7:93 - 192.168.88.1 - Intern +vr1 - port 1 - ALIX - Intern - 4c:5e:0c:74:d7:93 - 192.168.88.1 - kabel kabel 5 - port 2 - M5 - Unused - dc:9f:db:64:23:63 - 172.16.7.211 - Richting Heineken - il-zo -kabel 6 - port 3 - LocoM2 - AP - dc:9f:db:36:d9:fb - 172.17.115.2 - AP +Intern 6 - port 3 - LocoM2 - AP - dc:9f:db:36:d9:fb - 172.17.115.2 - AP kabel 7 - port 4 - M5 - Heineken - dc:9f:db:64:24:5f - 172.16.5.83 - Richting Panterra - il-n kabel 8 - port 5 - LocoM2 - AP - dc:9f:db:3e:1e:37 - 172.17.116.2 - AP @@ -23,4 +23,10 @@ ================= kabel 9 - vr2 - LocoM2 - AP - dc:9f:db:3e:25:79 - 172.17.114.2 - AP Klok + +172.17.104.0/24: 172.17.104.1 en 172.17.104.2 en 172.17.104.3 ... 172.17.104.252 en 172.17.104.253 en 172.17.104.254 +172.17.107.0/24: 172.17.107.1 en 172.17.107.2 en 172.17.107.3 ... 172.17.107.252 en 172.17.107.253 en 172.17.107.254 +172.17.108.0/24: 172.17.108.1 en 172.17.108.2 en 172.17.108.3 ... 172.17.108.252 en 172.17.108.253 en 172.17.108.254 +172.17.115.0/24: 172.17.115.1 en 172.17.115.2 en 172.17.115.3 ... 172.17.115.252 en 172.17.115.253 en 172.17.115.254 +172.17.116.0/24: 172.17.116.1 en 172.17.116.2 en 172.17.116.3 ... 172.17.116.252 en 172.17.116.253 en 172.17.116.254 @@ -89,2 +95,28 @@ + + + +vr0: flags=8843 metric 0 mtu 1500 + options=8280b + ether 00:0d:b9:2b:7b:48 + inet 172.16.5.57 netmask 0xfffffff8 broadcast 172.16.5.63 + inet6 fe80::20d:b9ff:fe2b:7b48%vr0 prefixlen 64 scopeid 0x1 + inet 172.16.3.98 netmask 0xfffffff8 broadcast 172.16.3.103 + inet 172.16.7.201 netmask 0xfffffff8 broadcast 172.16.7.207 + inet 192.168.188.2 netmask 0xffffff00 broadcast 192.168.188.255 + inet 192.168.88.2 netmask 0xffffff00 broadcast 192.168.88.255 + nd6 options=29 + media: Ethernet autoselect (100baseTX ) + status: active + +vr1: flags=8843 metric 0 mtu 1500 + options=8280b + ether 00:0d:b9:2b:7b:49 + inet 172.16.5.84 netmask 0xfffffff8 broadcast 172.16.5.87 + inet6 fe80::20d:b9ff:fe2b:7b49%vr1 prefixlen 64 scopeid 0x2 + nd6 options=29 + media: Ethernet autoselect (100baseTX ) + status: active + + Index: nodes/ZTWMeerburgkerk/wleiden.yaml =================================================================== --- nodes/ZTWMeerburgkerk/wleiden.yaml (revision 13678) +++ nodes/ZTWMeerburgkerk/wleiden.yaml (revision 13679) @@ -24,5 +24,22 @@ -iface_vr0_102: +iface_ue0: + comment : "Link naar Heineken" + ip : "172.16.7.212/29" + sdesc : "2heineken" + mode : "station-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "132" + ssid : "il-nw.heineken.wleiden.net" + dhcp : False + compass : "zo" + ns_ip : "172.16.7.211/29" + ns_mac : "dc:9f:db:64:23:63" + bridge_type: "NanoStation M5" + status : "up" + + +iface_vr0: comment : "Link naar VVMeerburg" ip : "172.16.5.57/29" @@ -40,5 +57,5 @@ status : "up" -iface_vr0_102_alias0: +iface_vr0_alias0: comment : "Link naar Rick" ip : "172.16.3.98/29" @@ -48,5 +65,5 @@ -iface_vr0_102_alias1: +iface_vr0_alias1: comment : "Link naar ZTWGemeenteHuis" ip : "172.16.7.201/29" @@ -64,61 +81,6 @@ status : "up" -iface_vr0_103: - comment : "Interlink kabel 2 - port 3" - parent : "bridge0" - sdesc : "2ap" - mode : "ap-wds" - type : "eth" - ssid : "WiFi Zoeterwoude" - ns_ip : "172.16.7.202/29" - status : "up" -iface_vr0_104: - comment : "Access Point - kabel 3 - port 4" - parent : "bridge0" - sdesc : "2ap" - mode : "ap-wds" - type : "eth" - ssid : "WiFi Zoeterwoude" - ns_ip : "192.168.1.23/24" - status : "up" - -iface_vr0_105: - comment : "Access Point - kabel 4 - port 5" - parent : "bridge0" - sdesc : "2ap" - mode : "ap-wds" - type : "eth" - ssid : "WiFi Zoeterwoude" - ns_ip : "192.168.1.22/24" - status : "up" - -iface_vr1_102: - comment : "Link naar Heineken" - ip : "172.16.7.212/29" - sdesc : "2heineken" - mode : "station-wds" - type : "eth" - extra_type : "eth2wifibridge" - channel : "132" - ssid : "il-nw.heineken.wleiden.net" - dhcp : False - compass : "zo" - ns_ip : "172.16.7.211/29" - ns_mac : "dc:9f:db:64:23:63" - bridge_type: "NanoStation M5" - status : "up" - -iface_vr1_103: - comment : "Access Point - kabel 6 - port 3" - parent : "bridge0" - sdesc : "2ap" - mode : "ap-wds" - type : "eth" - ssid : "WiFi Zoeterwoude" - ns_ip : "172.17.115.2/24" - status : "up" - -iface_vr1_104: +iface_vr1: comment : "Link naar PanTerra1" ip : "172.16.5.84/29" @@ -136,28 +98,3 @@ status : "up" -iface_vr1_105: - comment : "Access Point - kabel 8 - port 5" - parent : "bridge0" - sdesc : "2ap" - mode : "ap-wds" - type : "eth" - ssid : "WiFi Zoeterwoude" - ns_ip : "172.17.116.2/24" - status : "up" -iface_vr2: - comment : "Access Point - kabel 9 - Klok" - parent : "bridge0" - sdesc : "2ap" - mode : "ap-wds" - type : "eth" - ssid : "WiFi Zoeterwoude" - ns_ip : "172.17.114.2/24" - status : "up" - -iface_bridge0: - comment : "Access Point" - type : "eth" - ip : "172.17.114.1/24" - dhcp : "10-240" -