Index: nodes/HybridDeClercq/wleiden.yaml =================================================================== --- nodes/HybridDeClercq/wleiden.yaml (revision 11280) +++ nodes/HybridDeClercq/wleiden.yaml (revision 11281) @@ -60,7 +60,7 @@ iface_vr1: - comment : "link west (Roomburgh3)" - ip : "172.16.5.185/29" - sdesc : "2roomburgh3" + comment : "link west naar Roomburgh2" + ip : "172.16.5.177/29" + sdesc : "2roomburgh2" mode : "ap-wds" type : "eth" @@ -70,5 +70,5 @@ dhcp : False compass : "w" - ns_ip : "172.16.5.186/29" + ns_ip : "172.16.5.178/29" ns_mac : "00:15:6d:ea:f0:70" bridge_type: "NanoStation5" Index: nodes/HybridLeythenrode1/wleiden.yaml =================================================================== --- nodes/HybridLeythenrode1/wleiden.yaml (revision 11280) +++ nodes/HybridLeythenrode1/wleiden.yaml (revision 11281) @@ -92,12 +92,4 @@ -iface_vr2_alias0: - comment : "Temp. a-link to Roomburgh2" - ip : "172.16.5.177/29" - sdesc : "2Roomburgh2" - type : "eth" - extra_type : "eth2wifibridge" - dhcp : False - status : "up" Index: nodes/HybridRoomburgh1/wleiden.yaml =================================================================== --- nodes/HybridRoomburgh1/wleiden.yaml (revision 11281) +++ nodes/HybridRoomburgh1/wleiden.yaml (revision 11281) @@ -0,0 +1,94 @@ +# Genesis config yaml style +# vim:ts=2:et:sw=2:ai +# +board : "ALIX2" +comment : "None" +latitude : "52.15095" +location : "R.K. Zorgcentrum Roomburgh - noord, Hof van Roomburgh 46, 2314 ZC, Leiden" +longitude : "4.51315" +masterip : "172.18.48.1" +nodename : "Roomburgh1" +nodetype : "Hybrid" +rdnap_x : 95180 +rdnap_y : 462890 +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 voor de Noordzijde" + ip : "172.18.48.1/24" + sdesc : "ap" + mode : "ap" + type : "11b" + channel : "8" + ssid : "ap-WirelessLeiden-Roomburgh1" + dhcp : "10-250" + status : "up" + + +iface_ue0: + comment : "Lokaal subnet" + ip : "172.18.49.71/28" + sdesc : "localsubnet" + type : "eth" + dhcp : False + status : "up" + + +iface_vr0: + comment : "Link naar Lorentzhof" + ip : "172.16.5.193/29" + sdesc : "2xxxx" + mode : "ap-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "100" + ssid : "il-wzw.roomburgh1.wleiden.net" + dhcp : False + compass : "wsw" + ns_ip : "172.16.5.194/29" + ns_mac : "00:15:6d:ea:f0:38" + bridge_type: "NanoStation5" + status : "down" + + +iface_vr1: + comment : "Link naar Cetim1" + ip : "172.16.16.84/29" + sdesc : "2cetim1" + mode : "station-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "132" + ssid : "il-zo.cetim1.wleiden.net" + dhcp : False + compass : "nw" + ns_ip : "172.16.16.83/29" + ns_mac : "00:15:6d:ea:ef:87" + bridge_type: "NanoStation5" + status : "up" + + +iface_vr2: + comment : "Link naar Rosmolen" + ip : "172.16.3.41/29" + sdesc : "2rosmolen" + mode : "ap-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "124" + ssid : "il-nnw.roomburgh1.wleiden.net" + dhcp : False + compass : "n" + ns_ip : "172.16.3.42/29" + ns_mac : "00:15:6d:ea:f0:62" + bridge_type: "NanoStation5" + status : "up" + + Index: nodes/HybridRoomburgh2/wleiden.yaml =================================================================== --- nodes/HybridRoomburgh2/wleiden.yaml (revision 11281) +++ nodes/HybridRoomburgh2/wleiden.yaml (revision 11281) @@ -0,0 +1,78 @@ +# Genesis config yaml style +# vim:ts=2:et:sw=2:ai +# +board : "ALIX2" +comment : "None" +ileiden : False +latitude : "52.15108" +location : "R.K. Zorgcentrum Roomburgh, Hof van Roomburgh 46, 2314 ZC, Leiden" +longitude : "4.51322" +masterip : "172.18.49.1" +nodename : "Roomburgh2" +nodetype : "Hybrid" +rdnap_x : 95185 +rdnap_y : 462905 +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 voor de Zuidzijde" + ip : "172.18.49.1/24" + sdesc : "ap" + mode : "ap" + type : "11b" + channel : "4" + ssid : "ap-WirelessLeiden-Roomburgh2" + dhcp : "10-250" + status : "up" + + +iface_vr0: + comment : "Lokaal subnet" + ip : "172.18.49.72/28" + sdesc : "localsubnet" + type : "eth" + dhcp : False + status : "up" + + +iface_vr1: + comment : "link naar DeClercq" + ip : "172.16.5.180/29" + sdesc : "2noordoost" + mode : "station-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "44" + ssid : "il-w.declercq.wleiden.net" + dhcp : False + compass : "o" + ns_ip : "172.16.5.179/29" + ns_mac : "00:15:6d:ea:f0:5f" + bridge_type: "NanoStation5" + status : "up" + + +iface_vr2: + comment : "Link naar LivingLab" + ip : "172.16.4.57/29" + sdesc : "2LivingLab" + mode : "station-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "116" + ssid : "il-zw.roomburgh2.wleiden.net" + dhcp : False + compass : "w" + ns_ip : "172.16.4.58/29" + ns_mac : "00:15:6d:eb:ef:a7" + bridge_type: "NanoStation5" + status : "up" + + Index: nodes/HybridRoomburgh3/wleiden.yaml =================================================================== --- nodes/HybridRoomburgh3/wleiden.yaml (revision 11281) +++ nodes/HybridRoomburgh3/wleiden.yaml (revision 11281) @@ -0,0 +1,78 @@ +# Genesis config yaml style +# vim:ts=2:et:sw=2:ai +# +board : "ALIX2" +comment : "None" +ileiden : True +latitude : "52.15095" +location : "R.K. Zorgcentrum Roomburgh, Hof van Roomburgh 46, 2314 ZC, Leiden" +longitude : "4.51315" +masterip : "172.18.50.1" +nodename : "Roomburgh3" +nodetype : "Hybrid" +rdnap_x : 95180 +rdnap_y : 462890 +release : "9.0-RELEASE" +service_accesspoint: True +service_incoming_rdr: False +service_proxy_ileiden: False +service_proxy_normal: False +status : "up" + + + +iface_ath0: + comment : "B-link naar ...." + ip : "172.16.3.161/30" + sdesc : "2undefined" + mode : "ap" + type : "11b" + channel : "" + ssid : "il-n3.roomburgh3.wleiden.net" + dhcp : False + status : "up" + + +iface_vr0: + comment : "Lokaal subnet" + ip : "172.18.49.73/28" + sdesc : "localsubnet" + type : "eth" + dhcp : False + status : "up" + + +iface_vr1: + comment : "Ethernet to interlink north-east (DeClerq)" + ip : "172.16.5.188/29" + sdesc : "2DeClerq" + mode : "station-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "52" + ssid : "il-w.declercq.wleiden.net" + dhcp : False + compass : "o" + ns_ip : "172.16.5.187/29" + ns_mac : "00:15:6d:bd:69:30" + bridge_type: "NanoStation5" + status : "up" + + +iface_vr2: + comment : "Link to Zijloever via Nanostation5" + ip : "172.16.4.233/29" + sdesc : "2zijloever" + mode : "ap-wds" + type : "eth" + extra_type : "eth2wifibridge" + channel : "44" + ssid : "il-n.roomburgh3.wleiden.net" + dhcp : False + compass : "n" + ns_ip : "172.16.4.234/29" + ns_mac : "00:15:6d:ea:f0:28" + bridge_type: "NanoStation5" + status : "up" + +