Compare commits

..

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

2 changed files with 76 additions and 237 deletions

View File

@ -14,6 +14,13 @@
"domain": "Backbone",
"adresses": ["185.66.193.107"]
},
{
"name": "VPN02",
"fqdn": "vpn02.fftdf.de",
"mac": "00:00:00:00:00:02",
"domain": "VPN2",
"adresses": ["5.9.220.115"]
},
{
"name": "troidsorf4",
"fqdn": "4.fftdf.de",

View File

@ -1,8 +1,8 @@
{
"devices": [
{
"name": "AM-01n",
"mac": "0c:ea:14:d9:91:48",
"name": "AM-01",
"mac": "18:e8:29:9c:90:ae",
"gateway_nexthop": "18e82924170a",
"gateway": "a28cae6ff604",
"linked_to": "18:e8:29:24:17:0a",
@ -13,8 +13,8 @@
}
},
{
"name": "AM-02n",
"mac": "0c:ea:14:d9:c3:10",
"name": "AM-02",
"mac": "18:e8:29:9c:96:ba",
"gateway_nexthop": "18e82924170a",
"gateway": "a28cae6ff604",
"linked_to": "18:e8:29:24:17:0a",
@ -25,8 +25,8 @@
}
},
{
"name": "AM-03n",
"mac": "9c:05:d6:10:4e:b0",
"name": "AM-03",
"mac": "18:e8:29:9c:9f:5c",
"gateway_nexthop": "18e82924170a",
"gateway": "a28cae6ff604",
"linked_to": "18:e8:29:24:17:0a",
@ -117,18 +117,6 @@
"latitude": 50.813522712
}
},
{
"name": "Busbahnhof-AP",
"mac": "9c:05:d6:2c:fa:cb",
"gateway_nexthop": "e43883d5305d",
"gateway": "a28cae6ff605",
"linked_to": "e4:38:83:d5:30:5d",
"domain": "inn",
"location": {
"longitude": 7.152098,
"latitude": 50.813879
}
},
{
"name": "Rathaus-Nord",
"mac": "74:83:c2:96:56:c5",
@ -189,87 +177,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",
"linked_to": "74:83:c2:f6:15:8a",
"domain": "tdf",
"location": {
"longitude": 7.103946,
"latitude": 50.781408
"longitude": 7.103984803,
"latitude": 50.781481065
}
},
{
"name": "Bismarkplatz-1",
"mac": "e0:63:da:b6:79:ba",
"gateway_nexthop": "74acb9a2047a",
"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": "tdf",
"linked_to": "74:ac:b9:a2:04:7a",
"location": {
"latitude": 50.809092,
"longitude": 7.150598
}
},
{
"name": "Bismarkplatz-2",
"mac": "e0:63:da:b6:a9:7c",
"gateway_nexthop": "74acb9a2047a",
"gateway": "a28cae6ff604",
"domain": "tdf",
"linked_to": "74:ac:b9:a2:04:7a",
"location": {
"latitude": 50.808964,
"longitude": 7.150549
}
},
{
"name": "Bismarkplatz-3",
"mac": "e0:63:da:b6:ad:d4",
"gateway_nexthop": "74acb9a2047a",
"gateway": "a28cae6ff604",
"domain": "tdf",
"linked_to": "74:ac:b9:a2:04:7a",
"location": {
"latitude": 50.809094,
"longitude": 7.150726
}
},
{
"name": "Bismarkplatz-4",
"mac": "e0:63:da:b6:b0:2e",
"gateway_nexthop": "74acb9a2047a",
"gateway": "a28cae6ff604",
"domain": "tdf",
"linked_to": "74:ac:b9:a2:04:7a",
"location": {
"latitude": 50.808937,
"longitude": 7.150681
"longitude": 7.104215473,
"latitude": 50.781399662
}
},
{
@ -945,7 +873,7 @@
}
},
{
"name": "Zur-Grube-Versöhnung",
"name": "Zur-Grube-Versöhnung-3",
"mac": "18:e8:29:c6:d4:97",
"gateway_nexthop": "18e8292363d8",
"gateway": "a28cae6ff604",
@ -1220,42 +1148,42 @@
"longitude": 7.140161
}
},
{
"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",
"location": {
"latitude":50.813885,
"longitude":7.156474
}
},
{
"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",
"location": {
"latitude":50.814265,
"longitude":7.156171
}
},
{
"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",
"location": {
"latitude":50.814495,
"longitude":7.155739
}
},
{
"name": "Galerie-TDF-1",
"mac": "60:22:32:a1:fc:23",
"gateway_nexthop": "d021f9bbdc06",
"gateway": "000000000001",
"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": "000000000001",
"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": "000000000001",
"linked_to": "d0:21:f9:bb:dc:06",
"domain": "VPN1",
"location": {
"latitude":50.814495,
"longitude":7.155739
}
},
{
"name": "Hippolytushaus- EG-05-18",
"mac": "60:22:32:af:b2:1b",
@ -1355,9 +1283,9 @@
{
"name": "Curieweg-1",
"mac": "e0:63:da:b6:78:c0",
"gateway_nexthop": "7483c2f6158a",
"gateway_nexthop": "74acb9a222da",
"gateway": "a28cae6ff604",
"linked_to": "74:83:c2:f6:15:8a",
"linked_to": "74:ac:b9:a2:22:da",
"domain": "tdf",
"location": {
"longitude": 7.154726833,
@ -1367,9 +1295,9 @@
{
"name": "Curieweg-2",
"mac": "e0:63:da:b6:7b:2b",
"gateway_nexthop": "7483c2f6158a",
"gateway_nexthop": "74acb9a222da",
"gateway": "a28cae6ff604",
"linked_to": "74:83:c2:f6:15:8a",
"linked_to": "74:ac:b9:a2:22:da",
"domain": "tdf",
"location": {
"longitude": 7.154787183,
@ -1379,99 +1307,15 @@
{
"name": "Curieweg-3",
"mac": "e0:63:da:b6:b3:a5",
"gateway_nexthop": "7483c2f6158a",
"gateway_nexthop": "74acb9a222da",
"gateway": "a28cae6ff604",
"linked_to": "74:83:c2:f6:15:8a",
"linked_to": "74:ac:b9:a2:22:da",
"domain": "tdf",
"location": {
"longitude": 7.154808,
"longitude": 7.154873013,
"latitude": 50.803305678
}
},
{
"name": "CW-Cont-01",
"mac": "e0:63:da:b6:a9:e9",
"gateway_nexthop": "7483c2f6158a",
"gateway": "a28cae6ff604",
"linked_to": "74:83:c2:f6:15:8a",
"domain": "tdf",
"location": {
"longitude": 7.155104,
"latitude": 50.803212
}
},
{
"name": "CW-Cont-02",
"mac": "e0:63:da:b6:78:aa",
"gateway_nexthop": "7483c2f6158a",
"gateway": "a28cae6ff604",
"linked_to": "74:83:c2:f6:15:8a",
"domain": "tdf",
"location": {
"longitude": 7.155082,
"latitude": 50.803131
}
},
{
"name": "NKS_AP1",
"mac": "fc:ec:da:31:d7:eb",
"gateway_nexthop": "74acb9a222da",
"gateway": "a28cae6ff604",
"linked_to": "74:ac:b9:a2:22:da",
"domain": "tdf",
"location": {
"longitude": 7.116652,
"latitude": 50.827248
}
},
{
"name": "NKS_AP2",
"mac": "fc:ec:da:34:29:f5",
"gateway_nexthop": "74acb9a222da",
"gateway": "a28cae6ff604",
"linked_to": "74:ac:b9:a2:22:da",
"domain": "tdf",
"location": {
"longitude": 7.116508,
"latitude": 50.827343
}
},
{
"name": "NKS_AP3",
"mac": "fc:ec:da:34:26:2a",
"gateway_nexthop": "74acb9a222da",
"gateway": "a28cae6ff604",
"linked_to": "74:ac:b9:a2:22:da",
"domain": "tdf",
"location": {
"longitude": 7.116406,
"latitude": 50.827130
}
},
{
"name": "NKS_AP4",
"mac": "fc:ec:da:34:2b:4b",
"gateway_nexthop": "74acb9a222da",
"gateway": "a28cae6ff604",
"linked_to": "74:ac:b9:a2:22:da",
"domain": "tdf",
"location": {
"longitude": 7.116301,
"latitude": 50.827185
}
},
{
"name": "NKS_AP5",
"mac": "fc:ec:da:34:26:79",
"gateway_nexthop": "74acb9a222da",
"gateway": "a28cae6ff604",
"linked_to": "74:ac:b9:a2:22:da",
"domain": "tdf",
"location": {
"longitude": 7.116461,
"latitude": 50.827177
}
},
{
"name": "Robert-Mueller-Platz-1",
"mac": "e0:63:da:b6:b2:59",
@ -1795,7 +1639,7 @@
"longitude": 7.153735,
"latitude": 50.804895
}
},
},
{
"name": "Im Laach 9a-A1",
"mac": "44:d9:e7:f6:90:1d",
@ -1808,7 +1652,7 @@
"latitude": 50.813564
}
},
{
{
"name": "Im Laach 9a-A-Mensa",
"mac": "d0:21:f9:e5:b4:8c",
"gateway_nexthop": "f492bfad193e",
@ -1820,18 +1664,6 @@
"longitude": 7.174747
}
},
{
"name": "Im Laach 9a-A-Halle",
"mac": "d0:21:f9:48:e5:c0",
"gateway_nexthop": "f492bfad193e",
"gateway": "a28cae6ff605",
"linked_to": "f4:92:bf:ad:19:3e",
"domain": "inn",
"location": {
"latitude": 50.813571,
"longitude": 7.174678
}
},
{
"name": "Im Laach 9a-A3",
"mac": "d0:21:f9:e5:ad:e8",
@ -1856,7 +1688,7 @@
"latitude": 50.813479
}
},
{
{
"name": "Im Laach 9a-B-WiFi mesh, (ex. 9a-A2)",
"mac": "d0:21:f9:e5:b0:64",
"gateway_nexthop": "f492bfad2c7c",
@ -1868,7 +1700,7 @@
"longitude": 7.175065
}
},
{
{
"name": "Im Laach 9a-B1",
"mac": "d0:21:f9:e5:b5:64",
"gateway_nexthop": "f492bfad2c7c",
@ -1880,7 +1712,7 @@
"longitude": 7.174892
}
},
{
{
"name": "Im Laach 9a-B2",
"mac": "d0:21:f9:e5:b5:94",
"gateway_nexthop": "f492bfad2c7c",
@ -1892,7 +1724,7 @@
"longitude": 7.174585
}
},
{
{
"name": "Im Laach 9a-B3",
"mac": "d0:21:f9:e5:b9:20",
"gateway_nexthop": "f492bfad2c7c",
@ -1904,7 +1736,7 @@
"longitude": 7.175043
}
},
{
{
"name": "Im Laach 9a-B4",
"mac": "d0:21:f9:e5:b5:c4",
"gateway_nexthop": "f492bfad2c7c",
@ -1916,7 +1748,7 @@
"longitude": 7.174764
}
},
{
{
"name": "Im Laach 9a-B5",
"mac": "d0:21:f9:e5:b5:ec",
"gateway_nexthop": "f492bfad2c7c",