Fixing code blocks (#163)

Fixes the blacklist where the install should be a part of the ppm
testing. Adjusts code block language markup. Changes most variables that
can be replaced by that of .env.

Author: mys721tx

feeder-containers/feeding-adsbhub.md

@@ -28,13 +28,13 @@ In your station preferences, you should set the following:
 
 Inside your application directory \(`/opt/adsb`\), edit the `.env` file using your favourite text editor. Beginners may find the editor `nano` easy to use:
 
-```text
+```shell
 nano /opt/adsb/.env
 ```
 
 This file holds all of the commonly used variables \(such as our latitude, longitude and altitude\). We're going to add our ADSBHub Station Key to this file. Add the following line to the file:
 
-```text
+```shell
 ADSBHUB_STATION_KEY='YOURSTATIONKEY'
 ```
 
@@ -43,7 +43,7 @@ ADSBHUB_STATION_KEY='YOURSTATIONKEY'
 
 For example:
 
-```text
+```shell
 ADSBHUB_STATION_KEY='vrMr@AZn660X0H^0Usn~rcj$UJA7VlR.vEu4c;uh7mfU-J9ZUBXpJiUuWj37DTa5BtL'
 ```
 

feeder-containers/feeding-airnavradar.md

@@ -27,8 +27,7 @@ You'll need a _sharing key_. To get one, you can temporarily run the container,
 
 Inside your application directory \(`/opt/adsb`\), run the following commands:
 
-```bash
-docker pull ghcr.io/sdr-enthusiasts/docker-airnavradar:latest
+```shell
 source ./.env
 timeout 60 docker run \
     --rm \
@@ -38,7 +37,7 @@ timeout 60 docker run \
     -e LAT=${FEEDER_LAT} \
     -e LONG=${FEEDER_LONG} \
     -e ALT=${FEEDER_ALT_M} \
-    ghcr.io/sdr-enthusiasts/docker-airnavradar
+    ghcr.io/sdr-enthusiasts/docker-airnavradar:latest
 ```
 
 The command will run the container for one minute, which should be ample time for the container to connect to Airnav Radar receive a sharing key.
@@ -95,13 +94,13 @@ As you can see from the output above, the sharing key given to us from Airnav Ra
 
 If the script doesn't output the sharing key, it can be found by using the following command:
 
-```bash
+```shell
 docker exec -it rbfeeder /bin/sh -c "cat /etc/rbfeeder.ini" | grep key
 ```
 
 Command output:
 
-```text
+```shell
 key=g45643ab345af3c5d5g923a99ffc0de9
 ```
 
@@ -115,21 +114,21 @@ key=g45643ab345af3c5d5g923a99ffc0de9
 
 Inside your application directory \(`/opt/adsb`\), edit the `.env` file using your favourite text editor. Beginners may find the editor `nano` easy to use:
 
-```bash
+```shell
 nano /opt/adsb/.env
 ```
 
 This file holds all of the commonly used variables \(such as our latitude, longitude and altitude\). We're going to add our `rbfeeder` sharing key to this file. Add the following line to the file:
 
-```bash
+```shell
 AIRNAVRADAR_SHARING_KEY=YOURSHARINGKEY
 ```
 
 * Replace `YOURSHARINGKEY` with the sharing key that was generated in the previous step.
 
 For example:
 
-```bash
+```shell
 AIRNAVRADAR_SHARING_KEY=g45643ab345af3c5d5g923a99ffc0de9
 ```
 

feeder-containers/feeding-flightaware-piaware.md

@@ -20,7 +20,7 @@ You'll need your _feeder-id_ from your existing feeder.
 
 To get your _feeder-id_, log onto your feeder via SSH and issue the command:
 
-```bash
+```shell
 piaware-config -show feeder-id
 ```
 
@@ -32,7 +32,7 @@ You'll need a _feeder-id_. To get one, you can temporarily run the container, to
 
 Inside your application directory \(`/opt/adsb`\), run the following commands:
 
-```text
+```shell
 docker pull ghcr.io/sdr-enthusiasts/docker-piaware:latest
 source ./.env
 timeout 60 docker run --rm -e LAT="$FEEDER_LAT" -e LONG="$FEEDER_LONG" ghcr.io/sdr-enthusiasts/docker-piaware:latest | grep "my feeder ID"
@@ -42,7 +42,7 @@ The command will run the container for 60 seconds, which should be ample time fo
 
 For example:
 
-```text
+```ShellSession
 $ timeout 60 docker run --rm LAT="$FEEDER_LAT" -e LONG="$FEEDER_LONG" ghcr.io/sdr-enthusiasts/docker-piaware:latest | grep "my feeder ID"
 Set allow-mlat to yes in /etc/piaware.conf:1
 Set allow-modeac to yes in /etc/piaware.conf:2
@@ -65,21 +65,21 @@ Note - for PiAware/FlightAware feeding to work correctly, you MUST accurately se
 
 Inside your application directory \(`/opt/adsb`\), edit the `.env` file using your favourite text editor. Beginners may find the editor `nano` easy to use:
 
-```bash
+```shell
 nano /opt/adsb/.env
 ```
 
 This file holds all of the commonly used variables \(such as our latitude, longitude and altitude\). We're going to add our `piaware` feeder-id to this file. Add the following line to the file:
 
-```text
+```shell
 PIAWARE_FEEDER_ID=YOURFEEDERID
 ```
 
 * Replace `YOURFEEDERID` with the feeder-id that was generated in the previous step.
 
 For example:
 
-```text
+```shell
 PIAWARE_FEEDER_ID=acbf1f88-09a4-3a47-a4a0-10ae138d0c1g
 ```
 

feeder-containers/feeding-flightradar24.md

@@ -18,7 +18,7 @@ You'll need your _fr24key_ from your existing feeder.
 
 To get your _fr24key_, log onto your feeder and issue the command:
 
-```bash
+```shell
 cat /etc/fr24feed.ini | grep fr24key
 ```
 
@@ -36,7 +36,7 @@ Use the same email address as for your fr24 account if you already have one or p
 
 Run the command:
 
-```text
+```shell
 docker run -it --rm ghcr.io/sdr-enthusiasts/docker-baseimage:qemu bash -c "$(curl -sSL https://raw.githubusercontent.com/sdr-enthusiasts/docker-flightradar24/main/get_adsb_key.sh)"
 ```
 
@@ -64,15 +64,15 @@ Congratulations! You are now registered and ready to share ADS-B data with Fligh
 
 Copy the sharing key you are given, and add the following line to your `.env` file:
 
-```text
+```shell
 FR24_SHARING_KEY=YOURSHARINGKEY
 ```
 
 - Replace `YOURSHARINGKEY` with the sharing key from the output of the manual sign-up process.
 
 For example:
 
-```text
+```shell
 FR24_SHARING_KEY=10ae138d0c1g
 ```
 
@@ -82,7 +82,7 @@ Get a separate sharing key for UAT as described [here](https://github.com/sdr-en
 
 Copy the UAT sharing key you are given, and add the following line to your `.env` file:
 
-```text
+```shell
 FR24_SHARING_KEY_UAT=YOURSHARINGKEYUAT
 ```
 

feeder-containers/feeding-new-aggregators.md

@@ -52,7 +52,7 @@ Append the following lines to the end of the file \(inside the `services:` secti
 
 If you already have a `UUID` that was generated for the ADSBExchange service, feel free to reuse that one. If you don't have one, you can generate one by logging onto you Linux machine (Raspberry Pi, etc.) and giving this command:
 
-```bash
+```shell
 cat  /proc/sys/kernel/random/uuid
 ```
 

feeder-containers/feeding-opensky-network.md

@@ -16,27 +16,41 @@ Firstly, make sure you have registered for an account on the [OpenSky Network we
 
 In order to obtain a feeder serial number, we will start a temporary container running `opensky-feeder`, which will connect to OpenSky Network and be issued a serial number. The temporary container will automatically be stopped and deleted after 60 seconds.
 
+Inside your application directory \(`/opt/adsb`\), edit the `.env` file using your favourite text editor. Beginners may find the editor `nano` easy to use:
+
+```shell
+nano /opt/adsb/.env
+```
+
+This file holds all of the commonly used variables \(such as our latitude, longitude and altitude\). We're going to add our OpenSky username to this file. Add the following line to the file:
+
+```shell
+OPENSKY_USERNAME='YOUROPENSKYUSERNAME'
+```
+
+* Replace `YOUROPENSKYUSERNAME` with the station key you retrieved earlier.
+
+For example:
+
+```shell
+OPENSKY_USERNAME=johnnytightlips
+```
+
 To do this, run the command:
 
-```text
+```shell
+source ./.env
 timeout 60s docker run \
     --rm \
     -it \
-    -e LAT=YOURLATITUDE \
-    -e LONG=YOURLONGITUDE \
-    -e ALT=YOURALTITUDE \
+    -e LAT=${FEEDER_LAT} \
+    -e LONG=${FEEDER_LONG} \
+    -e ALT=${FEEDER_ALT_M} \
     -e BEASTHOST=ultrafeeder\
-    -e OPENSKY_USERNAME=YOUROPENSKYUSERNAME \
-    ghcr.io/sdr-enthusiasts/docker-opensky-network
+    -e OPENSKY_USERNAME=${OPENSKY_USERNAME} \
+    ghcr.io/sdr-enthusiasts/docker-opensky-network:latest
 ```
 
-Be sure to change the following:
-
-* Replace `YOURLATITUDE` with the latitude of your antenna \(xx.xxxxx\)
-* Replace `YOURLONGITUDE` with the longitude of your antenna \(xx.xxxxx\)
-* Replace `YOURALTITUDE` with the altitude above sea level of your antenna _**in metres**_
-* Replace `YOUROPENSKYUSERNAME` with your OpenSky Network username
-
 Once the container has started, you should see output similar to the following:
 
 ```text
@@ -103,23 +117,23 @@ As you can see from the output above, we've been allocated a serial number of `-
 
 Inside your application directory \(`/opt/adsb`\), edit the `.env` file using your favourite text editor. Beginners may find the editor `nano` easy to use:
 
-```text
+```shell
 nano /opt/adsb/.env
 ```
 
 This file holds all of the commonly used variables \(such as our latitude, longitude and altitude\). We're going to add our OpenSky-Network username and serial to this file. Add the following lines to the file:
 
-```text
+```shell
 OPENSKY_USERNAME=YOUROPENSKYUSERNAME
 OPENSKY_SERIAL=YOUROPENSKYSERIAL
 ```
 
-* Replace `YOUROPENSKYUSERNAME` with your OpenSky Network username
+* Replace `YOUROPENSKYUSERNAME` with your OpenSky Network username. Yo should have already done this in the previous step.
 * Replace `YOUROPENSKYSERIAL` with your OpenSky Network serial
 
 For example:
 
-```text
+```shell
 OPENSKY_USERNAME=johnnytightlips
 OPENSKY_SERIAL=-1408234269
 ```

feeder-containers/feeding-plane-watch.md

@@ -24,21 +24,21 @@ When you save your feeder, an **API Key** will be generated. Take note of this,
 
 Inside your application directory \(`/opt/adsb`\), edit the `.env` file using your favourite text editor. Beginners may find the editor `nano` easy to use:
 
-```bash
+```shell
 nano /opt/adsb/.env
 ```
 
 This file holds all of the commonly used variables \(such as our latitude, longitude and altitude\). We're going to add our plane.watch variables to this file. Add the following lines to the file:
 
-```text
+```shell
 PW_API_KEY=YOURAPIKEY
 ```
 
 * Replace `YOURAPIKEY` with the API KEY that was provided the previous step.
 
 For example:
 
-```text
+```shell
 PW_API_KEY=4e8413e6-52eb-11ea-8681-1c1b0d925d3g
 ```
 
@@ -127,5 +127,3 @@ After a few minutes, browse to [https://atc.plane.watch/](https://atc.plane.watc
 ## Advanced
 
 If you want to look at more options and examples for the `plane.watch` container, you can find the repository [here](https://github.com/plane-watch/docker-plane-watch).
-
-

feeder-containers/feeding-planefinder.md

@@ -26,7 +26,7 @@ You'll need a _share code_. In order to obtain a PlaneFinder Share Code, we will
 
 Run the command:
 
-```text
+```shell
 docker run \
     --rm \
     -it \
@@ -59,21 +59,21 @@ You should now claim your receiver:
 
 Inside your application directory \(`/opt/adsb`\), edit the `.env` file using your favourite text editor. Beginners may find the editor `nano` easy to use:
 
-```text
+```shell
 nano /opt/adsb/.env
 ```
 
 This file holds all of the commonly used variables \(such as our latitude, longitude and altitude\). We're going to add our `pfclient` share code to this file. Add the following line to the file:
 
-```text
+```shell
 PLANEFINDER_SHARECODE=YOURSHARECODE
 ```
 
 * Replace `YOURSHARECODE` with the share code that was generated in the previous step.
 
 For example:
 
-```text
+```shell
 PLANEFINDER_SHARECODE=zg84632abhf231
 ```
 
@@ -169,7 +169,7 @@ Once running, you can visit `http://docker.host.ip.addr:30053` to access the `pf
 
 If you are running a Raspberry Pi 5, then you may see the following messages in your Docker Compose log output:
 
-```
+```text
 pfclient      | [pfclient_daemon] /usr/local/bin/pfclient: error while loading shared libraries:
 pfclient      | [pfclient_daemon] /usr/local/bin/pfclient: error while loading shared libraries:
 pfclient      | [pfclient_daemon] /usr/local/bin/pfclient: error while loading shared libraries: