Compare commits

..

No commits in common. "master" and "angro-patch-55" have entirely different histories.

3 changed files with 199 additions and 229 deletions

View File

@ -1,32 +1,2 @@
## Config
### Unifi Access Points (unifi_devices.json)
In der Datei unifi_devices.json können die Access Points gepflegt werden, die auf der Freifunk Map erscheinen sollen.
Hierzu muss die Datei im json Format erweitert werden.
Für jedes Gerät muss dieser Block angelegt werden:
```json
{
"name": "ROUTERNAME",
"mac": "00:00:00:00:00",
"gateway_nexthop": "1234567890",
"gateway": "1234567890",
"linked_to": "18:e8:29:24:17:0a",
"domain": "unifi",
"location": {
"latitude":50.817093402,
"longitude":7.148406208
},
```
Erklärung:
* name: Dient nur zur Wiedererkennung. Auf der Map erscheint der Name aus dem Unifi Controller
* mac: Die MAC Adresse des Access Points. Zu finden im Controller. (Statistik Übersicht in der Geräteansicht)
* gateway_nexthop: Die Node ID (MAC ohne :) des Freifunk Routers an den der AP angeschlossen ist.
* gateway: Im Normalfall die NodeID des Supernodes (zu finden in der MAP)
* linked_to: (Optional) Die MAC Adresse des Routers an dem der AP angeschlossen ist. Normalerweise gateway_nexthop mit Doppelpunkten. Wenn nicht gesetzt wird kein Link auf der Map angezeigt.
* domain: Die Domain in der sich der AP befindet. (z.B. tdf, inn, flu)
* location: latitude, longitude
# ubnt-api-devices

View File

@ -1,3 +1,4 @@
{
"devices":[
{
@ -22,6 +23,17 @@
"latitude":50.802853080
}
},
{
"name": "Aggertal-Hotel",
"mac": "d0:21:f9:bb:e7:52",
"gateway_nexthop": "000000000001",
"gateway": "168f8c38748b",
"domain": "VPN1",
"location": {
"longitude":7.255375,
"latitude":50.881177
}
},
{
"name": "Achtermann-edge4",
"mac": "d0:21:f9:bb:db:8e",

View File

@ -216,102 +216,6 @@
"longitude":7.204934
}
},
{
"name": "DW-34.01",
"mac": "f4:e2:c6:6e:0b:e0",
"gateway_nexthop": "e43883d526d9",
"gateway": "3a1213fa88ec",
"linked_to": "e4:38:83:d5:26:d9",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.825918,
"longitude":7.205089
}
},
{
"name": "DW-34.02",
"mac": "f4:e2:c6:6e:21:a8",
"gateway_nexthop": "e43883d526d9",
"gateway": "3a1213fa88ec",
"linked_to": "e4:38:83:d5:26:d9",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.825613,
"longitude":7.205138
}
},
{
"name": "DW-34.03",
"mac": "f4:e2:c6:6e:09:90",
"gateway_nexthop": "e43883d526d9",
"gateway": "3a1213fa88ec",
"linked_to": "e4:38:83:d5:26:d9",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.825850,
"longitude":7.205207
}
},
{
"name": "DW-34.04",
"mac": "f4:e2:c6:6d:eb:34",
"gateway_nexthop": "e43883d526d9",
"gateway": "3a1213fa88ec",
"linked_to": "e4:38:83:d5:26:d9",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.825545,
"longitude":7.205256
}
},
{
"name": "HS-EG01",
"mac": "9c:05:d6:20:69:1c",
"gateway_nexthop": "70a741cda008",
"gateway": "3a1213fa88ec",
"linked_to": "70:a7:41:cd:a0:08",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.807463,
"longitude":7.227495
}
},
{
"name": "HS-EG02",
"mac": "9c:05:d6:20:7a:dc",
"gateway_nexthop": "70a741cda008",
"gateway": "3a1213fa88ec",
"linked_to": "70:a7:41:cd:a0:08",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.807359,
"longitude":7.227630
}
},
{
"name": "HS-OG03",
"mac": "9c:05:d6:20:69:1c",
"gateway_nexthop": "70a741cda008",
"gateway": "3a1213fa88ec",
"linked_to": "70:a7:41:cd:a0:08",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.807423,
"longitude":7.227556
}
},
{
"name": "HS-AC-M-OD",
"mac": "f4:e2:c6:19:4f:49",
"gateway_nexthop": "70a741cda008",
"gateway": "3a1213fa88ec",
"linked_to": "70:a7:41:cd:a0:08",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.807403,
"longitude":7.227491
}
},
{
"name": "HStr-1.OG",
"mac": "d0:21:f9:ed:f7:a8",
@ -384,13 +288,61 @@
"longitude":7.215937
}
},
{
"name": "FW_01",
"mac": "d0:21:f9:4f:2c:10",
"gateway_nexthop": "d021f9bbe752",
"gateway": "a28cae6ff604",
"linked_to": "d0:21:f9:bb:e7:52",
"domain": "VPN1",
"location": {
"latitude":50.881331,
"longitude":7.255684
}
},
{
"name": "FW_02",
"mac": "d0:21:f9:4f:2b:2c",
"gateway_nexthop": "d021f9bbe752",
"gateway": "a28cae6ff604",
"linked_to": "d0:21:f9:bb:e7:52",
"domain": "VPN1",
"location": {
"latitude":50.881409,
"longitude":7.255695
}
},
{
"name": "FW_03",
"mac": "d0:21:f9:4f:36:14",
"gateway_nexthop": "d021f9bbe752",
"gateway": "a28cae6ff604",
"linked_to": "d0:21:f9:bb:e7:52",
"domain": "VPN1",
"location": {
"latitude":50.881287,
"longitude":7.255260
}
},
{
"name": "FW_04",
"mac": "78:45:58:69:ec:b0",
"gateway_nexthop": "d021f9bbe752",
"gateway": "a28cae6ff604",
"linked_to": "d0:21:f9:bb:e7:52",
"domain": "VPN1",
"location": {
"latitude":50.881257,
"longitude":7.255424
}
},
{
"name": "Galerie-TDF-1",
"mac": "60:22:32:a1:fc:23",
"gateway_nexthop": "70a741cd983a",
"gateway": "3a1213fa88ec",
"linked_to": "70:a7:41:cd:98:3a",
"domain": "Soziale Netzwerke",
"gateway_nexthop": "d021f9bbdc06",
"gateway": "a28cae6ff604",
"linked_to": "d0:21:f9:bb:dc:06",
"domain": "VPN1",
"location": {
"latitude":50.813885,
"longitude":7.156474
@ -399,10 +351,10 @@
{
"name": "Galerie-TDF-2",
"mac": "60:22:32:a2:12:e9",
"gateway_nexthop": "70a741cd983a",
"gateway": "3a1213fa88ec",
"linked_to": "70:a7:41:cd:98:3a",
"domain": "Soziale Netzwerke",
"gateway_nexthop": "d021f9bbdc06",
"gateway": "a28cae6ff604",
"linked_to": "d0:21:f9:bb:dc:06",
"domain": "VPN1",
"location": {
"latitude":50.814265,
"longitude":7.156171
@ -411,10 +363,10 @@
{
"name": "Galerie-TDF-3",
"mac": "60:22:32:a7:fe:0d",
"gateway_nexthop": "70a741cd983a",
"gateway": "3a1213fa88ec",
"linked_to": "70:a7:41:cd:98:3a",
"domain": "Soziale Netzwerke",
"gateway_nexthop": "d021f9bbdc06",
"gateway": "a28cae6ff604",
"linked_to": "d0:21:f9:bb:dc:06",
"domain": "VPN1",
"location": {
"latitude":50.814495,
"longitude":7.155739
@ -780,6 +732,30 @@
"longitude":7.223145
}
},
{
"name": "Scheiderhoehe_SH-AP01n",
"mac": "44:d9:e7:f6:90:62",
"gateway_nexthop": "7483c2f65916",
"gateway": "3a1213fa88ec",
"linked_to": "74:83:c2:f6:59:16",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.874744,
"longitude":7.227942
}
},
{
"name": "Scheiderhoehe_SH-AP02",
"mac": "44:d9:e7:f9:ae:05",
"gateway_nexthop": "7483c2f65916",
"gateway": "3a1213fa88ec",
"linked_to": "74:83:c2:f6:59:16",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.874798,
"longitude":7.228097
}
},
{
"name": "AdL-AP01",
"mac": "80:2a:a8:d6:ce:0f",
@ -936,18 +912,6 @@
"longitude":7.278044
}
},
{
"name": "WG_Hennef-AP01",
"mac": "ac:8b:a9:86:a5:db",
"gateway_nexthop": "7483c20e6b21",
"gateway": "3a1213fa88ec",
"linked_to": "74:83:c2:0e:6b:21",
"domain": "Soziale Netzwerke",
"location": {
"longitude": 7.272702,
"latitude": 50.776961
}
},
{
"name": "ROUTEMASTER- FFRS-AC-M01",
"mac": "b4:fb:e4:10:8a:2a",
@ -1150,39 +1114,27 @@
}
},
{
"name": "Astrid-Lindgren-Str-HE5.1",
"mac": "74:83:c2:cc:ba:67",
"gateway_nexthop": "70a741cd8760",
"gateway": "a28cae6ff604",
"linked_to": "70:a7:41:cd:87:60",
"domain": "tdf",
"location": {
"longitude": 7.104225,
"latitude": 50.781462
}
},
{
"name": "Astrid-Lindgren-Str-HE5.2",
"mac": "74:83:c2:c3:bf:e2",
"gateway_nexthop": "70a741cd8760",
"gateway": "a28cae6ff604",
"linked_to": "70:a7:41:cd:87:60",
"domain": "tdf",
"location": {
"longitude": 7.104187,
"latitude": 50.781322
}
},
{
"name": "Astrid-Lindgren-Str-HE6.5",
"name": "Astrid-Lindgren-Str-1",
"mac": "74:83:c2:c3:b1:79",
"gateway_nexthop": "70a741cd8760",
"gateway_nexthop": "7483c2f6158a",
"gateway": "a28cae6ff604",
"linked_to": "70:a7:41:cd:87:60",
"domain": "tdf",
"linked_to": "74:83:c2:f6:15:8a",
"domain": "Troisdorf Umland",
"location": {
"longitude": 7.103946,
"latitude": 50.781408
"longitude": 7.103984803,
"latitude": 50.781481065
}
},
{
"name": "Astrid-Lindgren-Str-2",
"mac": "74:83:c2:c3:bf:e2",
"gateway_nexthop": "7483c2f6158a",
"gateway": "a28cae6ff604",
"linked_to": "74:83:c2:f6:15:8a",
"domain": "Troisdorf Umland",
"location": {
"longitude": 7.104215473,
"latitude": 50.781399662
}
},
{
@ -1881,6 +1833,90 @@
"latitude": 50.802158919
}
},
{
"name": "LindStr_H3-AP01",
"mac": "d0:21:f9:b7:fe:ec",
"gateway_nexthop": "70a741de6a08",
"gateway": "a28cae6ff606",
"linked_to": "70:a7:41:de:6a:08",
"domain": "flu",
"location": {
"latitude": 50.816514,
"longitude": 7.139949
}
},
{
"name": "LindStr_H4-AP02",
"mac": "d0:21:f9:42:db:c0",
"gateway_nexthop": "70a741de6a08",
"gateway": "a28cae6ff606",
"linked_to": "70:a7:41:de:6a:08",
"domain": "flu",
"location": {
"latitude": 50.816592,
"longitude": 7.139528
}
},
{
"name": "LindStr_H4-AP03",
"mac": "d0:21:f9:42:d6:e0",
"gateway_nexthop": "70a741de6a08",
"gateway": "a28cae6ff606",
"linked_to": "70:a7:41:de:6a:08",
"domain": "flu",
"location": {
"latitude": 50.816675,
"longitude": 7.139271
}
},
{
"name": "LindStr_H4-AP04",
"mac": "d0:21:f9:42:fb:f4",
"gateway_nexthop": "70a741de6a08",
"gateway": "a28cae6ff606",
"linked_to": "70:a7:41:de:6a:08",
"domain": "flu",
"location": {
"latitude": 50.816753,
"longitude": 7.139040
}
},
{
"name": "LindStr_H4-AP05",
"mac": "d0:21:f9:42:92:d8",
"gateway_nexthop": "70a741de6a08",
"gateway": "a28cae6ff606",
"linked_to": "70:a7:41:de:6a:08",
"domain": "flu",
"location": {
"latitude": 50.816880,
"longitude": 7.138731
}
},
{
"name": "LindStr_H1.15",
"mac": "d0:21:f9:7d:35:fc",
"gateway_nexthop": "f492bfad2ab4",
"gateway": "a28cae6ff605",
"linked_to": "f4:92:bf:ad:2a:b4",
"domain": "inn",
"location": {
"latitude": 50.816176,
"longitude": 7.140397
}
},
{
"name": "LindStr_H1.21",
"mac": "d0:21:f9:7d:2f:a8",
"gateway_nexthop": "f492bfad2ab4",
"gateway": "a28cae6ff605",
"linked_to": "f4:92:bf:ad:2a:b4",
"domain": "inn",
"location": {
"latitude": 50.816264,
"longitude": 7.140161
}
},
{
"name": "Hippolytushaus- EG-05-18",
"mac": "60:22:32:af:b2:1b",
@ -2469,54 +2505,6 @@
"latitude": 50.895146
}
},
{
"name": "Dinslaken FF-02",
"mac": "d0:21:f9:b7:d3:48",
"gateway_nexthop": "70a741de7e5a",
"gateway": "32eb70e0b4d9",
"linked_to": "70:a7:41:de:7e:5a",
"domain": "Porz",
"location": {
"latitude": 50.895454,
"longitude": 7.059105
}
},
{
"name": "Dortmund",
"mac": "e0:63:da:6d:c6:73",
"gateway_nexthop": "d021f9b7c87c",
"gateway": "32eb70e0b4d9",
"linked_to": "d0:21:f9:b7:c8:7c",
"domain": "Porz",
"location": {
"latitude": 50.895333,
"longitude": 7.059028
}
},
{
"name": "Flur FF-04",
"mac": "d0:21:f9:b7:c8:7c",
"gateway_nexthop": "70a741de7e5a",
"gateway": "32eb70e0b4d9",
"linked_to": "70:a7:41:de:7e:5a",
"domain": "Porz",
"location": {
"latitude": 50.895431,
"longitude": 7.058968
}
},
{
"name": "Holzwerkstatt FF-06",
"mac": "d0:21:f9:47:f4:58",
"gateway_nexthop": "70a741de7e5a",
"gateway": "32eb70e0b4d9",
"linked_to": "70:a7:41:de:7e:5a",
"domain": "Porz",
"location": {
"latitude": 50.895469,
"longitude": 7.058706
}
},
{
"name": "Gemeindehaus St. Gerhard-01",
"mac": "78:45:58:48:6d:04",