From 75fdaf46598e2ea64cf84cb1c80673d97867a531 Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Sun, 14 Feb 2021 19:23:11 +0100 Subject: [PATCH] Cleanup jsons --- example.config.json | 27 +++++-- devices.json => example.devices.json | 0 example.json | 92 ------------------------ ucDevices.json => example.ucDevices.json | 0 4 files changed, 22 insertions(+), 97 deletions(-) rename devices.json => example.devices.json (100%) delete mode 100644 example.json rename ucDevices.json => example.ucDevices.json (100%) diff --git a/example.config.json b/example.config.json index ca7db0b..ef11cd8 100644 --- a/example.config.json +++ b/example.config.json @@ -1,15 +1,32 @@ { "unms": { - "enabled": true, + "enabled": false, "unmsAPIUrl": "https://unifi.freifunk-troisdorf.de/v2.1", - "APItoken": "API TOKEN", - "devicesURL": "https://git.freifunk-rhein-sieg.net/Freifunk-Troisdorf/ubnt-freifunk-map-api/raw/branch/master/" + "APItoken": "UNMS API TOKEN", + "devicesURL": "https://git.freifunk-rhein-sieg.net/Freifunk-Troisdorf/ubnt-freifunk-map-api/raw/branch/master/example.devices.json" }, "unifi": { - "enabled": true, + "enabled": false, "APIUrl": "https://unifi.freifunk-troisdorf.de:8443", "user": "APIuser", "password": "PASSWORD", - "ucDevicesURL": "https://git.freifunk-rhein-sieg.net/Freifunk-Troisdorf/ubnt-freifunk-map-api/raw/branch/master/" + "ucDevicesURL": "https://git.freifunk-rhein-sieg.net/Freifunk-Troisdorf/ubnt-freifunk-map-api/raw/branch/master/example.ucDevices.json" + }, + "meshviewer": { + "enabled": false, + "files": [ + { + "name": "tdf4", + "URL": "http://4.fftdf.de/meshviewer.json" + }, + { + "name": "tdf5", + "URL": "http://5.fftdf.de/meshviewer.json" + }, + { + "name": "tdf6", + "URL": "http://6.fftdf.de/meshviewer.json" + } + ] } } \ No newline at end of file diff --git a/devices.json b/example.devices.json similarity index 100% rename from devices.json rename to example.devices.json diff --git a/example.json b/example.json deleted file mode 100644 index dff915b..0000000 --- a/example.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "timestamp": "2021-01-01T21:16:19+0100", - "nodes": [ - { - "firstseen": "2020-01-20T17:38:03+0000", - "lastseen": "2021-01-01T20:16:07+0000", - "is_online": true, - "is_gateway": false, - "clients": 0, - "clients_wifi24": 0, - "clients_wifi5": 0, - "clients_other": 0, - "rootfs_usage": 0, - "loadavg": 0.02, - "memory_usage": 0.66, - "uptime": "2020-11-22T14:02:13+0000", - "gateway_nexthop": "18e8292f7de6", - "gateway": "a28cae6ff604", - "location": { - "longitude": 7.148406208, - "latitude": 50.817093402 - }, - "node_id": "18e8298ec64d", - "mac": "18:e8:29:8e:c6:4d", - "addresses": [ - "10.188.41.164" - ], - "domain": "rifu", - "hostname": "[RiFu] Port 5 - zu Bahnhof", - "owner": "Freifunk Rhein-Sieg", - "firmware": { - "base": "Ubiquiti - Stock", - "release": "8.7.1" - }, - "autoupdater": { - "enabled": false, - "branch": "stable" - }, - "nproc": 1, - "model": "NBE-5AC-Gen2" - }, - { - "firstseen": "2020-05-05T20:08:20+0000", - "lastseen": "2021-01-01T20:15:52+0000", - "is_online": true, - "is_gateway": false, - "clients": 0, - "clients_wifi24": 0, - "clients_wifi5": 0, - "clients_other": 0, - "rootfs_usage": 0, - "loadavg": 0.27, - "memory_usage": 0.68, - "uptime": "2020-10-24T21:47:33+0000", - "gateway_nexthop": "18e8292f7de6", - "gateway": "a28cae6ff604", - "location": { - "longitude": 7.15043664, - "latitude": 50.814456507 - }, - "node_id": "18e829dcc37e", - "mac": "18:e8:29:dc:c3:7e", - "addresses": [ - "10.188.47.143" - ], - "domain": "rifu", - "hostname": "[RiFu] Bahnhof-TDF", - "owner": "Freifunk Rhein-Sieg", - "firmware": { - "base": "Ubiquiti - Stock", - "release": "8.7.1" - }, - "autoupdater": { - "enabled": false, - "branch": "stable" - }, - "nproc": 1, - "model": "NBE-5AC-Gen2" - } - ], - "links": [ - { - "type": "wifi", - "source": "18e8298ec64d", - "target": "18e829dcc37e", - "source_tq": 0.315, - "target_tq": 0.315, - "source_addr": "18:e8:29:8e:c6:4d", - "target_addr": "18:e8:29:dc:c3:7e" - } - ] -} \ No newline at end of file diff --git a/ucDevices.json b/example.ucDevices.json similarity index 100% rename from ucDevices.json rename to example.ucDevices.json