Changeset 11261 in genesis

Timestamp:

Jun 9, 2012, 9:01:46 AM (13 years ago)

Author:

huub

Message:

nodes unigor naar hybrid

Location:

nodes

Files:

• CNodeZwaluwak/wleiden.yaml (modified) (1 diff)
• HybridUniGor1 (moved) (moved from nodes/CNodeUniGor1 )
• HybridUniGor1/wleiden.yaml (modified) (6 diffs)
• HybridUniGor2 (moved) (moved from nodes/CNodeUniGor2 )
• HybridUniGor2/wleiden.yaml (modified) (5 diffs)
• HybridUniGorN (moved) (moved from nodes/CNodeUniGorN )
• HybridUniGorN/wleiden.yaml (modified) (3 diffs)
• HybridZwet/wleiden.yaml (modified) (1 diff)

nodes/CNodeZwaluwak/wleiden.yaml

@@ -32 +32 @@
   comment    : "A-link naar NodeUnigor via Airlive"
   ip         : "172.16.3.70/30"
-  sdesc      : "2unigor"
+  sdesc      : "2unigor1"
   mode       : "station-wds"
   type       : "eth"
   extra_type : "eth2wifibridge"
-  ssid       : "ila-z.unigor.wleiden.net"
+  ssid       : "il-z.unigor1.wleiden.net"
   dhcp       : False
   compass    : "no"
   ns_ip      : "192.168.1.21"
+  ns_mac     : "00:4f:79:90:31:bf"
   status     : "up"
 

nodes/HybridUniGor1/wleiden.yaml

@@ -4 +4 @@
 board     : "ALIX2"
 comment   : "None"
-ileiden   : True
 latitude  : "52.16782"
 location  : "Gorleus Lab Universiteit Leiden, Einsteinweg 55, 2333 CC, Leiden"
@@ -10 +9 @@
 masterip  : "172.17.35.1"
 nodename  : "UniGor1"
-nodetype  : "CNode"
+nodetype  : "Hybrid"
 rdnap_x   : 91540
 rdnap_y   : 464813
-release   : "8.2-RELEASE"
+service_accesspoint: True
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
 status    : "up"
 
@@ -39 +41 @@
 
 iface_vr1:
-  comment    : "A link naar Cope via nanostation 1"
+  comment    : "link naar Cope"
   ip         : "172.16.3.185/29"
   sdesc      : "2cope"
-  mode       : "station-wds"
+  mode       : "ap-wds"
   type       : "eth"
   extra_type : "eth2wifibridge"
@@ -56 +58 @@
 
 iface_vr1_alias0:
-  comment    : "A link naar LUMC"
+  comment    : "link naar LUMC"
   ip         : "172.16.4.81/29"
   sdesc      : "2lumc"
@@ -65 +67 @@
 
 iface_vr2:
-  comment    : "A link naar Robijn via nanostation 2"
+  comment    : "link naar Robijn"
   ip         : "172.16.5.217/29"
   sdesc      : "2robijn"
-  mode       : "station-wds"
+  mode       : "ap-wds"
   type       : "eth"
   extra_type : "eth2wifibridge"
@@ -82 +84 @@
 
 iface_vr2_alias0:
-  comment    : "A Link naar Zwaluwak via nanostation 2"
+  comment    : "Link naar Zwaluwak"
   ip         : "172.16.3.69/30"
   sdesc      : "2zwaluwak"

nodes/HybridUniGor2/wleiden.yaml

@@ -4 +4 @@
 board     : "ALIX2"
 comment   : "None"
-ileiden   : True
 latitude  : "52.16782"
 location  : "Gorleus Lab Universiteit Leiden, Einsteinweg 55, 2333 CC, Leiden"
@@ -10 +9 @@
 masterip  : "172.22.8.1"
 nodename  : "UniGor2"
-nodetype  : "CNode"
+nodetype  : "Hybrid"
 rdnap_x   : 91540
 rdnap_y   : 464813
-release   : "8.2-RELEASE"
+service_accesspoint: True
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
 status    : "up"
-
 
 iface_ath0:
@@ -39 +40 @@
 
 iface_vr1:
-  comment    : "Link naar Brug"
+  comment    : "b-Link naar Brug"
   ip         : "172.16.16.129/29"
   sdesc      : "2brug"
-  mode       : "station-wds"
+  mode       : "ap-wds"
   type       : "eth"
   channel    : "7"
@@ -54 +55 @@
 
 iface_vr1_alias0:
-  comment    : "Link naar AZC via bullet 2"
+  comment    : "b-Link naar AZC via bullet 2"
   ip         : "172.16.0.165/30"
   sdesc      : "2azc"
@@ -64 +65 @@
 
 iface_vr2:
-  comment    : "A-link Nanostation5 naar DirkLos2"
+  comment    : "link naar DirkLos2"
   ip         : "172.16.4.1/29"
   sdesc      : "2DirkLos2"
-  mode       : "station-wds"
+  mode       : "ap-wds"
   type       : "eth"
   extra_type : "eth2wifibridge"

nodes/HybridUniGorN/wleiden.yaml

@@ -4 +4 @@
 board     : "ALIX2"
 comment   : "None"
-ileiden   : True
 latitude  : "52.16825"
 location  : "Gorleus Lab Universiteit Leiden, Einsteinweg 55, 2333 CC, Leiden"
@@ -10 +9 @@
 masterip  : "172.19.135.1"
 nodename  : "UniGorN"
-nodetype  : "CNode"
+nodetype  : "Hybrid"
 rdnap_x   : 91544
 rdnap_y   : 464861
-release   : "9.0-RELEASE"
+service_accesspoint: True
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
 status    : "up"
 
@@ -19 +21 @@
 iface_ath0:
   comment    : "Oegstgeest richting N"
-  ip         : "172.19.135.1/26"
+  ip         : "172.19.135.1/24"
   sdesc      : "n"
   mode       : "ap"
   type       : "11b"
   channel    : "4"
-  ssid       : "ap-n.unigorn.wleiden.net"
-  dhcp       : "10-60"
+  ssid       : "ap-WirelessLeiden-Unigor-noord"
+  dhcp       : "10-250"
   compass    : "n"
   status     : "up"

nodes/HybridZwet/wleiden.yaml

@@ -4 +4 @@
 board     : "ALIX2"
 comment   : "None"
-ileiden   : False
 latitude  : "52.11836"
 location  : "Fam van der Zwet, Nieuweweg 3, 2381 NW,Zoeterwoude "