From 587c1cddc2367928fd641ebe11e2ceb2a44bff7b Mon Sep 17 00:00:00 2001 From: kx1t <15090643+kx1t@users.noreply.github.com> Date: Sat, 21 Sep 2024 09:17:22 -0400 Subject: [PATCH 1/2] set default value of `lourd` for `$RADARVIRTUEL_FEEDER_KEY` --- rootfs/etc/s6-overlay/scripts/aiscatcher | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootfs/etc/s6-overlay/scripts/aiscatcher b/rootfs/etc/s6-overlay/scripts/aiscatcher index 246e0d6..005c070 100755 --- a/rootfs/etc/s6-overlay/scripts/aiscatcher +++ b/rootfs/etc/s6-overlay/scripts/aiscatcher @@ -120,8 +120,8 @@ fi # Add a number of well-known feeders: # ADSBNetwork / RadarVirtuel: -if [[ -n "${RADARVIRTUEL_FEEDER_KEY:+$RADARVIRTUEL_STATION_ID}" ]]; then - aiscatcher_command+=("-H https://ais.adsbnetwork.com/ingester/insert/$RADARVIRTUEL_FEEDER_KEY ID $RADARVIRTUEL_STATION_ID INTERVAL 15 RESPONSE off") +if [[ -n "${RADARVIRTUEL_STATION_ID}" ]]; then + aiscatcher_command+=("-H https://ais.adsbnetwork.com/ingester/insert/${RADARVIRTUEL_FEEDER_KEY:-lourd} ID $RADARVIRTUEL_STATION_ID INTERVAL 15 RESPONSE off") fi # AirFrames: From 40e0ba42208f2487c9b5f4f4a4976279b93fdb46 Mon Sep 17 00:00:00 2001 From: kx1t <15090643+kx1t@users.noreply.github.com> Date: Sat, 21 Sep 2024 09:22:06 -0400 Subject: [PATCH 2/2] clarify RadarVirtuel parameter use --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 760ed98..a6fa831 100644 --- a/README.md +++ b/README.md @@ -229,7 +229,7 @@ This table shows which parameters to set and how to obtain credentials for a num | Name | Parameter | Default IP/DNS/URL | Feeding protocol:
UDP/TCP/HTTP/Other | How to register for a key or ID | | ---- | --------- | ------------------ | --------------------------------------- | ------------------------------- | - | ADSB-Network (RadarVirtuel) | `RADARVIRTUEL_FEEDER_KEY`
`RADARVIRTUEL_STATION_ID` | [https://ais.adsbnetwork.com/ingester/insert/$RADARVIRTUEL_FEEDER_KEY](https://ais.adsbnetwork.com/ingester/insert/$RADARVIRTUEL_FEEDER_KEY) | HTTP | Email with your request to join | + | ADSB-Network (RadarVirtuel) | `RADARVIRTUEL_FEEDER_KEY` (optional, value is `lourd` if omitted)
`RADARVIRTUEL_STATION_ID` | [https://ais.adsbnetwork.com/ingester/insert/$RADARVIRTUEL_FEEDER_KEY](https://ais.adsbnetwork.com/ingester/insert/$RADARVIRTUEL_FEEDER_KEY) | HTTP | Email with your request to join. If you receive an `ais-catcher` string like this: `-H http://ais.adsbnetwork.com/ingester/insert/lourd ID xx INTERVAL 5 RESPONSE off`, then simply set `RADARVIRTUEL_STATION_ID` to `xx` and omit or leave blank the `RADARVIRTUEL_FEEDER_KEY` parameter | | Airframes | `AIRFRAMES_STATION_ID` | [http://feed.airframes.io:5599](http://feed.airframes.io:5599) | HTTP | No signup needed. `AIRFRAMES_STATION_ID` is a self-chosen ID that has the form of `II-STATIONNAME-AIS`, where `II` are the initials of the owner's name, and `STATIONNAME` is a self-chosen station name (A-Z, 0-9 only please) | | AIS-Catcher | `AISCATCHER_SHAREDATA=true`
`AISCATCHER_FEEDER_KEY` | | Other | See [Exchanging data with `aiscatcher.org`](#exchanging-data-with-aiscatcherorg) [https://aiscatcher.org/#join](https://aiscatcher.org/#join). In the future, AISCatcher may provide you with an optional UUID that you can set in `AISCATCHER_FEEDER_KEY` | | AISHub | `AISHUB_UDP_PORT` | [data.aishub.net](http://data.aishub.net) | UDP | [https://www.aishub.net/join-us](https://www.aishub.net/join-us) |