Index: nodes/HybridLivingLab/wleiden.yaml =================================================================== --- nodes/HybridLivingLab/wleiden.yaml (revision 11261) +++ nodes/HybridLivingLab/wleiden.yaml (revision 11263) @@ -71,5 +71,5 @@ ip : "172.16.17.105/29" sdesc : "2AJSoft2" - mode : "station-wds" + mode : "ap-wds" type : "eth" extra_type : "eth2wifibridge" @@ -87,5 +87,5 @@ ip : "172.16.17.113/29" sdesc : "2Haagwijk" - mode : "station-wds" + mode : "ap-wds" type : "eth" extra_type : "eth2wifibridge" Index: nodes/HybridPsycho/wleiden.yaml =================================================================== --- nodes/HybridPsycho/wleiden.yaml (revision 11263) +++ nodes/HybridPsycho/wleiden.yaml (revision 11263) @@ -0,0 +1,101 @@ +# Genesis config yaml style +# vim:ts=2:et:sw=2:ai +# +board : "ALIX2" +comment : "None" +latitude : "52.16962" +location : "Pieter de la Courtgebouw, Wassenaarseweg 52, 2333 AK, Leiden" +longitude : "4.47808" +masterip : "172.19.133.1" +nodename : "Psycho" +nodetype : "Hybrid" +rdnap_x : "092806" +rdnap_y : 464997 +release : "9.0-RELEASE" +service_accesspoint: True +service_incoming_rdr: False +service_proxy_ileiden: False +service_proxy_normal: False +status : "up" + +iface_ath0: + comment : "Ap" + ip : "172.19.133.1/24" + sdesc : "ap" + mode : "ap" + type : "11b" + channel : "5" + ssid : "ap-WirelessLeiden-Psycho" + dhcp : "10-250" + status : "up" + + +iface_ue0: + comment : "A-link noord - woutertje pieterse school" + ip : "172.16.16.121/29" + sdesc : "2wp" + mode : "ap-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "116" + ssid : "il-n.psycho.wleiden.net" + dhcp : False + compass : "n" + ns_ip : "172.16.16.122/29" + ns_mac : "00:15:6d:70:4d:ae" + bridge_type: "NanoStation5" + status : "up" + + +iface_ue0_alias0: + comment : "A-link noord - de leidse houtschool" + ip : "172.16.3.49/29" + type : "eth" + extra_type : "eth2wifibridge" + dhcp : False + status : "up" + + +iface_vr0: + comment : "A-link naar UniGorN" + ip : "172.16.16.108/29" + sdesc : "2unigorn" + mode : "station-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "104" + ssid : "il-o.unigorn.wleiden.net" + dhcp : False + compass : "w" + ns_ip : "172.16.16.107/29" + ns_mac : "00:15:6d:70:4d:a7" + bridge_type: "NanoStation5" + status : "up" + + +iface_vr1: + comment : "Ethernet to interlink oost" + ip : "172.16.16.116/29" + sdesc : "2som2" + mode : "station-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "140" + ssid : "il-w.som2.wleiden.net" + dhcp : False + compass : "o" + ns_ip : "172.16.16.115/29" + ns_mac : "00:15:6d:70:4e:84" + bridge_type: "NanoStation5" + status : "up" + + +iface_vr2: + comment : "Ethernet naar webcam" + ip : "172.16.16.69/30" + sdesc : "2webcam" + type : "eth" + dhcp : False + status : "up" + + Index: nodes/HybridVictoria/wleiden.yaml =================================================================== --- nodes/HybridVictoria/wleiden.yaml (revision 11263) +++ nodes/HybridVictoria/wleiden.yaml (revision 11263) @@ -0,0 +1,98 @@ +# Genesis config yaml style +# vim:ts=2:et:sw=2:ai +# +board : "ALIX2" +comment : "None" +latitude : "52.15569" +location : "Victoria Vastgoed, Gangetje 14, 2311ER, Leiden" +longitude : "4.49327" +masterip : "172.17.140.1" +nodename : "Victoria" +nodetype : "Hybrid" +rdnap_x : 93826 +rdnap_y : 463434 +release : "9.0-RELEASE" +service_accesspoint: True +service_incoming_rdr: False +service_proxy_ileiden: False +service_proxy_normal: False +status : "up" + +iface_ath0: + comment : "Ap" + ip : "172.17.140.1/26" + sdesc : "ap" + mode : "ap" + type : "11b" + channel : "5" + ssid : "ap-WirelessLeiden-Victoria" + dhcp : "10-60" + status : "up" + + +iface_ue0: + comment : "Ethernet naar lokaal AP met PoE" + ip : "172.17.140.65/26" + sdesc : "lokaalAP" + mode : "ap" + type : "eth" + extra_type : "eth2wifibridge" + channel : "6" + ssid : "ap2-WirelessLeiden-Victoria" + dhcp : "70-120" + ns_ip : "172.17.14.66/26" + ns_mac : "" + status : "up" + + +iface_vr0: + comment : "A-link naar Stadhuis" + ip : "172.16.17.196/29" + sdesc : "2stadhuis" + mode : "station-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "44" + ssid : "il-zo.stadhuis.wleiden.net" + dhcp : False + compass : "nw" + ns_ip : "172.16.17.195/29" + ns_mac : "00:15:6d:70:51:f2" + bridge_type: "NanoStation5" + status : "up" + + +iface_vr1: + comment : "A-link naar CeTIM2" + ip : "172.16.17.204/29" + sdesc : "2cetim2" + mode : "station-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "116" + ssid : "il-zw.cetim2.wleiden.net" + dhcp : False + compass : "n" + ns_ip : "172.16.17.203/29" + ns_mac : "00:15:6d:70:53:7f" + bridge_type: "NanoStation5" + status : "up" + + +iface_vr2: + comment : "Nog vrij" + ip : "172.16.17.209/29" + sdesc : "2vrij" + mode : "ap-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "124" + ssid : "il-zo.victoria.wleiden.net" + dhcp : False + compass : "se" + ns_ip : "172.16.17.210/29" + ns_mac : "00:15:6d:70:53:39" + bridge_type: "NanoStation5" + status : "down" + + Index: nodes/HybridWebster/wleiden.yaml =================================================================== --- nodes/HybridWebster/wleiden.yaml (revision 11263) +++ nodes/HybridWebster/wleiden.yaml (revision 11263) @@ -0,0 +1,113 @@ +# Genesis config yaml style +# vim:ts=2:et:sw=2:ai +# +board : "ALIX2" +comment : "None" +latitude : "52.16032" +location : "Webster University, Galgewater, XXXX XX, Leiden" +longitude : "4.48344" +masterip : "172.17.15.1" +nodename : "Webster" +nodetype : "Hybrid" +rdnap_x : 93160 +rdnap_y : 463958 +release : "9.0-RELEASE" +service_accesspoint: True +service_incoming_rdr: False +service_proxy_ileiden: False +service_proxy_normal: False +status : "up" + +iface_ath0: + comment : "Ap" + ip : "172.17.15.1/24" + sdesc : "ap" + mode : "ap" + type : "11b" + channel : "7" + ssid : "ap-WirelessLeiden-Webster0" + dhcp : "10-100" + status : "up" + + +iface_ue0: + comment : "Ap Beestenmarkt via nano2M" + ip : "172.17.17.1/24" + sdesc : "ap1" + mode : "ap" + type : "eth" + extra_type : "eth2wifibridge" + channel : "10" + ssid : "ap-WirelessLeiden-Webster1" + dhcp : "10-100" + ns_ip : "172.17.17.2/24" + ns_mac : "00:27:22:80:5a:b4" + bridge_type: "NanoStation M2" + status : "up" + + +iface_ue1: + comment : "(nog) niet in gebruik" + ip : "172.17.19.1/24" + sdesc : "tbd" + mode : "ap-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "tbd" + ssid : "tbd" + dhcp : "10-100" + ns_ip : "172.17.19.2/24" + ns_mac : "tbd" + status : "down" + + +iface_vr0: + comment : "Link naar Geluidsnet2" + ip : "172.16.4.196/29" + sdesc : "2geluidsnet2" + mode : "station-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "132" + ssid : "il-z.geluidsnet2.wleiden.net" + dhcp : False + compass : "nw" + ns_ip : "172.16.4.195/29" + ns_mac : "00:15:6d:f2:37:c5" + bridge_type: "NanoStation5" + status : "up" + + +iface_vr1: + comment : "Link naar vosko3" + ip : "172.16.4.252/29" + sdesc : "2vosko3" + mode : "station-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "100" + ssid : "il-wnw.vosko3.wleiden.net" + dhcp : False + compass : "zo" + ns_ip : "172.16.4.251/29" + ns_mac : "00:15:6d:70:53:6c" + bridge_type: "NanoStation5" + status : "up" + + +iface_vr2: + comment : "Link naar LucasN" + ip : "172.16.4.180/29" + sdesc : "2lucasn" + mode : "station-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "36" + ssid : "il-zw.lucasn.wleiden.net" + dhcp : False + compass : "ne" + ns_ip : "172.16.4.179/29" + ns_mac : "00:27:22:10:f5:b4" + status : "up" + +