Adjustments to the JSON format.

[thirdparty/freifunk-ipfire.git] / sites / FFMS.json

diff --git a/sites/FFMS.json b/sites/FFMS.json
index af327292de1c24ade03b9dc976792895e60a0890..eec86f962187a3eae0bddd34f9a0115e51baf396 100644 (file)
--- a/sites/FFMS.json
+++ b/sites/FFMS.json
@@ -11,42 +11,57 @@
       "peer": "fusselkater",
       "key": "071576a93dd3e7dcdd6e566024879dd01a118cddbc4258247dd825ad42351394",
       "remote": "fusselkater.gw.freifunk-muenster.de",
-      "port": 14242
-
+      "port": 14242,
+      "mtu-vpn": 1406,
+      "ciphers": ["aes128-gcm", "salsa2012+gmac", "salsa2012+umac"]
     },
     {
       "peer": "commander1024",
       "key": "9bf14cf6faa8bc0bc87e45b109f065339551cf4ab63a668c1a90897f05eceb36",
       "remote": "commander1024.gw.freifunk-muenster.de",
-      "port": 14242
+      "port": 14242,
+      "mtu-vpn": 1406,
+      "ciphers": ["aes128-gcm", "salsa2012+gmac", "salsa2012+umac"]
     },
     {
       "peer": "fanlin",
       "key": "346234ecf552727233b406131c214b5b58ceb4b72b9503276aff419a02fc3137",
       "remote": "fanlin.gw.freifunk-muenster.de",
-      "port": 14242
+      "port": 14242,
+      "ciphers": ["aes128-gcm", "salsa2012+gmac", "salsa2012+umac"]
     }
   ],
-
-  "ciphers": ["aes128-gcm", "salsa2012+gmac", "salsa2012+umac"],
-  "mtu-vpn": 1406,
+  
   "batman-adv": "2013.4",
 
-  "wifi24": {
-    "ssid": "muenster.freifunk.net",
-    "channel": 1,
-    "htmode": "HT40+",
-    "mesh_ssid": "02:d1:11:37:fc:38",
-    "mesh_bssid": "02:d1:11:37:fc:38",
-    "mesh_mcast_rate": 12000
-  },
+  "adhoc" : [
+    {
+      "ssid": "02:d1:11:37:fc:38",
+      "bssid": "02:d1:11:37:fc:38",
+      "channel": 1,
+      "htmode": "HT40+",
+      "mesh_mcast_rate": 12000
+    },
+    {
+      "ssid": "02:d1:11:37:fc:38",
+      "bssid": "02:d1:11:37:fc:38",
+      "channel": 44,
+      "htmode" : "HT40+",
+      "mesh_mcast_rate": 12000
+    }
+  ],
+
+  "infrastructure" : [
+    { 
+      "ssid": "muenster.freifunk.net",
+      "channel": 1,
+      "htmode": "HT40+"
+    },
+    { 
+      "ssid": "muenster.freifunk.net (5GHz)",
+      "channel": 44,
+      "htmode": "HT40+"
+    }
+  ]
 
-  "wifi5": {
-    "ssid": "muenster.freifunk.net (5GHz)",
-    "channel": 44,
-    "htmode": "HT40+",
-    "mesh_ssid": "02:d1:11:37:fc:38",
-    "mesh_bssid": "02:d1:11:37:fc:38",
-    "mesh_mcast_rate": 12000
-  }
 }