Changeset 11263 in genesis

Timestamp:

Jun 10, 2012, 10:12:26 AM (12 years ago)

Author:

huub

Message:

webster psycho en victoria naar hybrid

Location:

nodes

Files:

• HybridLivingLab/wleiden.yaml (modified) (2 diffs)
• HybridPsycho (moved) (moved from nodes/CNodePsycho )
• HybridPsycho/wleiden.yaml (modified) (3 diffs)
• HybridVictoria (moved) (moved from nodes/CNodeVictoria )
• HybridVictoria/wleiden.yaml (modified) (4 diffs)
• HybridWebster (moved) (moved from nodes/CNodeWebster )
• HybridWebster/wleiden.yaml (modified) (4 diffs)

nodes/HybridLivingLab/wleiden.yaml

@@ -71 +71 @@
   ip         : "172.16.17.105/29"
   sdesc      : "2AJSoft2"
-  mode       : "station-wds"
+  mode       : "ap-wds"
   type       : "eth"
   extra_type : "eth2wifibridge"
@@ -87 +87 @@
   ip         : "172.16.17.113/29"
   sdesc      : "2Haagwijk"
-  mode       : "station-wds"
+  mode       : "ap-wds"
   type       : "eth"
   extra_type : "eth2wifibridge"

nodes/HybridPsycho/wleiden.yaml

@@ -4 +4 @@
 board     : "ALIX2"
 comment   : "None"
-ileiden   : True
 latitude  : "52.16962"
 location  : "Pieter de la Courtgebouw, Wassenaarseweg 52, 2333 AK, Leiden"
@@ -10 +9 @@
 masterip  : "172.19.133.1"
 nodename  : "Psycho"
-nodetype  : "CNode"
+nodetype  : "Hybrid"
 rdnap_x   : "092806"
 rdnap_y   : 464997
-release   : "8.2-RELEASE"
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
 status    : "up"
-
 
 iface_ath0:
@@ -33 +35 @@
   ip         : "172.16.16.121/29"
   sdesc      : "2wp"
-  mode       : "station-wds"
+  mode       : "ap-wds"
   type       : "eth"
   extra_type : "eth2wifibridge"

nodes/HybridVictoria/wleiden.yaml

@@ -4 +4 @@
 board     : "ALIX2"
 comment   : "None"
-ileiden   : True
 latitude  : "52.15569"
 location  : "Victoria Vastgoed, Gangetje 14, 2311ER, Leiden"
@@ -10 +9 @@
 masterip  : "172.17.140.1"
 nodename  : "Victoria"
-nodetype  : "CNode"
+nodetype  : "Hybrid"
 rdnap_x   : 93826
 rdnap_y   : 463434
-release   : "8.2-RELEASE"
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
 status    : "up"
-
 
 iface_ath0:
@@ -33 +35 @@
   ip         : "172.17.140.65/26"
   sdesc      : "lokaalAP"
-  mode       : "ap-wds"
+  mode       : "ap"
   type       : "eth"
   extra_type : "eth2wifibridge"
   channel    : "6"
-  ssid       : "ap-WirelessLeiden-Victoria2"
+  ssid       : "ap2-WirelessLeiden-Victoria"
   dhcp       : "70-120"
   ns_ip      : "172.17.14.66/26"
@@ -82 +84 @@
   ip         : "172.16.17.209/29"
   sdesc      : "2vrij"
-  mode       : "station-wds"
+  mode       : "ap-wds"
   type       : "eth"
   extra_type : "eth2wifibridge"

nodes/HybridWebster/wleiden.yaml

@@ -4 +4 @@
 board     : "ALIX2"
 comment   : "None"
-ileiden   : True
 latitude  : "52.16032"
 location  : "Webster University, Galgewater, XXXX XX, Leiden"
@@ -10 +9 @@
 masterip  : "172.17.15.1"
 nodename  : "Webster"
-nodetype  : "CNode"
+nodetype  : "Hybrid"
 rdnap_x   : 93160
 rdnap_y   : 463958
-release   : "8.2-RELEASE"
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
 status    : "up"
-
 
 iface_ath0:
@@ -33 +35 @@
   ip         : "172.17.17.1/24"
   sdesc      : "ap1"
-  mode       : "ap-wds"
+  mode       : "ap"
   type       : "eth"
   extra_type : "eth2wifibridge"
@@ -107 +109 @@
   ns_ip      : "172.16.4.179/29"
   ns_mac     : "00:27:22:10:f5:b4"
-  status     : "down"
+  status     : "up"