Compare commits

..

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

5 changed files with 133 additions and 512 deletions

17
.drone.yml Normal file
View File

@ -0,0 +1,17 @@
kind: pipeline
name: validate-json
steps:
- name: validate ucDevices.json
image: fftdf/docker-json-validate
commands:
- jsonlint ucDevices.json
when:
event: push
- name: validate Devices.json
image: fftdf/docker-json-validate
commands:
- jsonlint devices.json
when:
event: push

View File

@ -1,24 +0,0 @@
---
platform: linux/arm64
pipeline:
validate_Richtfunk_Devices:
image: git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-json-validate
commands:
- jsonlint rifu_devices.json
when:
event: push
validate_Router_Devices:
image: git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-json-validate
commands:
- jsonlint uisp_router.json
when:
event: push
validate_Unifi_Devices:
image: git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-json-validate
commands:
- jsonlint unifi_devices.json
when:
event: push

View File

@ -132,7 +132,7 @@
"longitude":7.061601877
}
},
{
{
"name": "Eifelstrasse_02-3",
"mac": "74:83:c2:96:c8:e6",
"gateway_nexthop": "18e829aeb7cc",
@ -144,24 +144,24 @@
"longitude":7.061596513
}
},
{
"name": "DW-32",
"mac": "e0:63:da:6d:c6:6d",
{
"name": "DW-01",
"mac": "18:e8:29:a6:c6:23",
"gateway_nexthop": "b4fbe4b1ac44",
"gateway": "3a1213fa88ec",
"linked_to": "b4:fb:e4:b1:ac:44",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.825849,
"longitude":7.204333
"latitude":50.825793,
"longitude":7.204645
}
},
{
"name": "DW-18n",
"mac": "18:e8:29:a6:c6:23",
"gateway_nexthop": "e063da6dc66d",
"name": "DW-02n",
"mac": "e0:63:da:6d:c6:70",
"gateway_nexthop": "18e829a6c623",
"gateway": "3a1213fa88ec",
"linked_to": "e0:63:da:6d:c6:6d",
"linked_to": "18:e8:29:a6:c6:23",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.825644,
@ -217,180 +217,24 @@
}
},
{
"name": "DW-34.01",
"mac": "f4:e2:c6:6e:0b:e0",
"gateway_nexthop": "e43883d526d9",
"name": "DW-32",
"mac": "e0:63:da:6d:c6:6d",
"gateway_nexthop": "e063da6dc670",
"gateway": "3a1213fa88ec",
"linked_to": "e4:38:83:d5:26:d9",
"linked_to": "e0:63:da:6d:c6:70",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.825918,
"longitude":7.205089
"latitude":50.825849,
"longitude":7.204333
}
},
{
"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",
"gateway_nexthop": "7483c20ea6f7",
"gateway": "3a1213fa88ec",
"linked_to": "74:83:c2:0e:a6:f7",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.834257,
"longitude":7.207165
}
},
{
"name": "HStr-2.OG",
"mac": "d0:21:f9:ee:30:60",
"gateway_nexthop": "7483c20ea6f7",
"gateway": "3a1213fa88ec",
"linked_to": "74:83:c2:0e:a6:f7",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.834206,
"longitude":7.207235
}
},
{
"name": "HStr-135a",
"mac": "ac:8b:a9:a0:1a:a8",
"gateway_nexthop": "7483c20ea6f7",
"gateway": "3a1213fa88ec",
"linked_to": "74:83:c2:0e:a6:f7",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.834164,
"longitude":7.207495
}
},
{
"name": "Hauptstr-17.01",
"mac": "ac:8b:a9:a0:09:90",
"gateway_nexthop": "18e82924170a",
"gateway": "3a1213fa88ec",
"linked_to": "18:e8:29:24:17:0a",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.842899,
"longitude":7.216001
}
},
{
"name": "Hauptstr-17.02",
"mac": "d0:21:f9:ee:35:5c",
"gateway_nexthop": "18e82924170a",
"gateway": "3a1213fa88ec",
"linked_to": "18:e8:29:24:17:0a",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.842770,
"longitude":7.215860
}
},
{
"name": "Hauptstr-17.03 (2.OG)",
"mac": "44:d9:e7:f9:ad:3f",
"gateway_nexthop": "18e82924170a",
"gateway": "3a1213fa88ec",
"linked_to": "18:e8:29:24:17:0a",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.842847,
"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",
"gateway_nexthop": "7483c20ea6f7",
"gateway": "02545624bdbe",
"linked_to": "74:83:c2:0e:a6:f7",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.881331,
"longitude":7.255684
@ -399,10 +243,10 @@
{
"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",
"gateway_nexthop": "7483c20ea6f7",
"gateway": "02545624bdbe",
"linked_to": "74:83:c2:0e:a6:f7",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.881409,
"longitude":7.255695
@ -411,10 +255,10 @@
{
"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",
"gateway_nexthop": "7483c20ea6f7",
"gateway": "02545624bdbe",
"linked_to": "74:83:c2:0e:a6:f7",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.881287,
"longitude":7.255260
@ -423,51 +267,15 @@
{
"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",
"gateway_nexthop": "7483c20ea6f7",
"gateway": "02545624bdbe",
"linked_to": "74:83:c2:0e:a6:f7",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.881257,
"longitude":7.255424
}
},
{
"name": "Galerie-TDF-1",
"mac": "60:22:32:a1:fc:23",
"gateway_nexthop": "d021f9bbdc06",
"gateway": "a28cae6ff604",
"linked_to": "d0:21:f9:bb:dc:06",
"domain": "VPN1",
"location": {
"latitude":50.813885,
"longitude":7.156474
}
},
{
"name": "Galerie-TDF-2",
"mac": "60:22:32:a2:12:e9",
"gateway_nexthop": "d021f9bbdc06",
"gateway": "a28cae6ff604",
"linked_to": "d0:21:f9:bb:dc:06",
"domain": "VPN1",
"location": {
"latitude":50.814265,
"longitude":7.156171
}
},
{
"name": "Galerie-TDF-3",
"mac": "60:22:32:a7:fe:0d",
"gateway_nexthop": "d021f9bbdc06",
"gateway": "a28cae6ff604",
"linked_to": "d0:21:f9:bb:dc:06",
"domain": "VPN1",
"location": {
"latitude":50.814495,
"longitude":7.155739
}
},
{
"name": "WB Alte Schule Seminarraum",
"mac": "74:83:c2:c3:38:47",
@ -516,6 +324,30 @@
"longitude":7.136886
}
},
{
"name": "WB Gereonshof Erdgeschoss",
"mac": "74:83:c2:c3:39:e9",
"gateway_nexthop": "7483c2f58187",
"gateway": "3a1213fa88ec",
"linked_to": "74:83:c2:f5:81:87",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.617666,
"longitude":7.125552
}
},
{
"name": "WB Gereonshof 1. OG Flur",
"mac": "74:83:c2:c3:38:c7",
"gateway_nexthop": "7483c2f58187",
"gateway": "3a1213fa88ec",
"linked_to": "74:83:c2:f5:81:87",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.617655,
"longitude":7.125458
}
},
{
"name": "WB Raiffeisenstrasse Erdgeschoss",
"mac": "74:83:c2:c3:3b:c5",
@ -564,54 +396,6 @@
"longitude":7.061806
}
},
{
"name": "WB AC-AP01",
"mac": "d0:21:f9:b7:d0:e4",
"gateway_nexthop": "70a741cdb532",
"gateway": "3a1213fa88ec",
"linked_to": "70:a7:41:cd:b5:32",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.633056,
"longitude":7.106561
}
},
{
"name": "WB AC-AP02",
"mac": "d0:21:f9:b7:d3:24",
"gateway_nexthop": "70a741cdb532",
"gateway": "3a1213fa88ec",
"linked_to": "70:a7:41:cd:b5:32",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.632845,
"longitude":7.106593
}
},
{
"name": "WB AC-AP03",
"mac": "d0:21:f9:42:93:24",
"gateway_nexthop": "70a741cdb532",
"gateway": "3a1213fa88ec",
"linked_to": "70:a7:41:cd:b5:32",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.633023,
"longitude":7.106620
}
},
{
"name": "WB AC-AP04",
"mac": "d0:21:f9:42:93:20",
"gateway_nexthop": "70a741cdb532",
"gateway": "3a1213fa88ec",
"linked_to": "70:a7:41:cd:b5:32",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.632819,
"longitude":7.106648
}
},
{
"name": "CP-Lohmar UAP-AC-M+DBdAnt_NORD",
"mac": "18:e8:29:56:51:1b",
@ -708,30 +492,6 @@
"longitude":7.199824
}
},
{
"name": "BW-EG-Lohmar",
"mac": "d0:21:f9:ee:37:a0",
"gateway_nexthop": "70a741de6054",
"gateway": "02545624bdbe",
"linked_to": "70:a7:41:de:60:54",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.832080,
"longitude":7.282269
}
},
{
"name": "BW-2.OG-Lohmar",
"mac": "d0:21:f9:ee:37:30",
"gateway_nexthop": "70a741de6054",
"gateway": "02545624bdbe",
"linked_to": "70:a7:41:de:60:54",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.832137,
"longitude":7.282298
}
},
{
"name": "AG-SU-Links1",
"mac": "b4:fb:e4:73:97:d2",
@ -891,9 +651,9 @@
{
"name": "Donrather Hof-01",
"mac": "e0:63:da:6d:c6:71",
"gateway_nexthop": "70a741cd69de",
"gateway_nexthop": "7483c2f5e694",
"gateway": "3a1213fa88ec",
"linked_to": "70:a7:41:cd:69:de",
"linked_to": "74:83:c2:f5:e6:94",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.853372,
@ -903,21 +663,21 @@
{
"name": "Donrather Hof-02",
"mac": "e0:63:da:6d:c8:7d",
"gateway_nexthop": "70a741cd69de",
"gateway_nexthop": "7483c2f5e694",
"gateway": "3a1213fa88ec",
"linked_to": "70:a7:41:cd:69:de",
"linked_to": "74:83:c2:f5:e6:94",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.853608,
"longitude":7.226708
"latitude":50.853606,
"longitude":7.226721
}
},
{
"name": "DHof-1.OG",
"mac": "78:45:58:60:cf:84",
"gateway_nexthop": "70a741cd69de",
"gateway_nexthop": "7483c2f5e694",
"gateway": "3a1213fa88ec",
"linked_to": "70:a7:41:cd:69:de",
"linked_to": "74:83:c2:f5:e6:94",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.853447,
@ -927,9 +687,9 @@
{
"name": "DHof-2.OG",
"mac": "d0:21:f9:42:d7:b0",
"gateway_nexthop": "70a741cd69de",
"gateway_nexthop": "7483c2f5e694",
"gateway": "3a1213fa88ec",
"linked_to": "70:a7:41:cd:69:de",
"linked_to": "74:83:c2:f5:e6:94",
"domain": "Soziale Netzwerke",
"location": {
"latitude":50.853505,
@ -1889,8 +1649,8 @@
"linked_to": "18:e8:29:23:63:d8",
"domain": "Troisdorf Umland",
"location": {
"longitude": 7.195542,
"latitude": 50.856878
"longitude": 7.19543606,
"latitude": 50.856953199
}
},
{
@ -1930,65 +1690,53 @@
}
},
{
"name": "LindStr_H3-AP01",
"mac": "d0:21:f9:b7:fe:ec",
"gateway_nexthop": "70a741de6a08",
"name": "LindStr_H7.01",
"mac": "d0:21:f9:42:db:c0",
"gateway_nexthop": "7483c20ea517",
"gateway": "a28cae6ff606",
"linked_to": "70:a7:41:de:6a:08",
"linked_to": "74:83:c2:0e:a5:17",
"domain": "flu",
"location": {
"latitude": 50.816514,
"longitude": 7.139949
"latitude": 50.817156,
"longitude": 7.138358
}
},
{
"name": "LindStr_H7.02",
"mac": "d0:21:f9:42:d6:e0",
"gateway_nexthop": "7483c20ea517",
"gateway": "a28cae6ff606",
"linked_to": "74:83:c2:0e:a5:17",
"domain": "flu",
"location": {
"latitude": 50.817264,
"longitude": 7.138078
}
},
{
"name": "LindStr_H7.03",
"mac": "d0:21:f9:42:fb:f4",
"gateway_nexthop": "7483c20ea517",
"gateway": "a28cae6ff606",
"linked_to": "74:83:c2:0e:a5:17",
"domain": "flu",
"location": {
"latitude": 50.817240,
"longitude": 7.138387
}
},
{
"name": "LindStr_H7.04",
"mac": "d0:21:f9:b7:fe:ec",
"gateway_nexthop": "7483c20ea517",
"gateway": "a28cae6ff606",
"linked_to": "74:83:c2:0e:a5:17",
"domain": "flu",
"location": {
"latitude": 50.817324,
"longitude": 7.138189
}
},
{
"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",
@ -2013,42 +1761,6 @@
"longitude": 7.140161
}
},
{
"name": "Hippolytushaus- EG-05-18",
"mac": "60:22:32:af:b2:1b",
"gateway_nexthop": "ac8ba9bbf0c9",
"gateway": "a28cae6ff605",
"linked_to": "ac:8b:a9:bb:f0:c9",
"domain": "inn",
"location": {
"latitude": 50.812443,
"longitude": 7.158463
}
},
{
"name": "Hippolytushaus- EG-05-19",
"mac": "60:22:32:99:ad:94",
"gateway_nexthop": "ac8ba9bbf0c9",
"gateway": "a28cae6ff605",
"linked_to": "ac:8b:a9:bb:f0:c9",
"domain": "inn",
"location": {
"latitude": 50.812414,
"longitude": 7.158777
}
},
{
"name": "Hippolytushaus- OG-04-22",
"mac": "60:22:32:f8:39:6d",
"gateway_nexthop": "ac8ba9bbf0c9",
"gateway": "a28cae6ff605",
"linked_to": "ac:8b:a9:bb:f0:c9",
"domain": "inn",
"location": {
"latitude": 50.812461,
"longitude": 7.158633
}
},
{
"name": "HeHau-1.OG",
"mac": "d0:21:f9:7d:3c:e0",
@ -2069,8 +1781,8 @@
"linked_to": "74:83:c2:f9:08:16",
"domain": "flu",
"location": {
"latitude": 50.857730,
"longitude": 7.194014
"latitude": 50.857789,
"longitude": 7.194027
}
},
{
@ -2362,7 +2074,7 @@
}
},
{
"name": "Reichensteinstr-5",
"name": "Reichensteinstr-1",
"mac": "e0:63:da:b6:b0:3e",
"gateway_nexthop": "7483c2f656d6",
"gateway": "a28cae6ff604",
@ -2373,30 +2085,6 @@
"latitude": 50.806890708
}
},
{
"name": "Reichensteinstr.Cont.-2",
"mac": "74:83:c2:c3:c0:1d",
"gateway_nexthop": "7483c2f65652",
"gateway": "a28cae6ff604",
"linked_to": "74:83:c2:f6:56:52",
"domain": "tdf",
"location": {
"longitude": 7.099400,
"latitude": 50.806951
}
},
{
"name": "Reichensteinstr.Cont.-3",
"mac": "e0:63:da:b6:aa:ef",
"gateway_nexthop": "7483c2f65652",
"gateway": "a28cae6ff604",
"linked_to": "74:83:c2:f6:56:52",
"domain": "tdf",
"location": {
"longitude": 7.099371,
"latitude": 50.807071
}
},
{
"name": "OHG-Kleiner-Saal",
"mac": "f4:92:bf:aa:0c:bc",
@ -2585,8 +2273,8 @@
"linked_to": "74:83:c2:0a:d1:5e",
"domain": "Soziale Netzwerke",
"location": {
"longitude": 7.059071,
"latitude": 50.895144
"longitude": 7.059083,
"latitude": 50.895140
}
},
{

View File

@ -1,60 +0,0 @@
{
"devices":[
{
"name": "Rathaus Uplink",
"mac": "18:e8:29:ad:9a:34",
"gateway_nexthop": "18e8292f7de6",
"gateway": "a28cae6ff604",
"domain": "tdf",
"location": {
"longitude":7.149406208,
"latitude":50.817093402
}
},
{
"name": "edge2-test",
"mac": "d0:21:f9:bb:db:d0",
"gateway_nexthop": "000000000001",
"gateway": "168f8c38748b",
"domain": "VPN1",
"location": {
"longitude":7.133350968,
"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",
"gateway_nexthop": "000000000001",
"gateway": "168f8c38748b",
"domain": "VPN1",
"location": {
"longitude":7.122906,
"latitude":50.819198
}
},
{
"name": "Galerie-Troisdorf",
"mac": "d0:21:f9:bb:dc:06",
"gateway_nexthop": "000000000001",
"gateway": "168f8c38748b",
"domain": "VPN1",
"location": {
"longitude":7.155843973,
"latitude":50.814017575
}
}
]
}