First draft for adsb.fi
This commit is contained in:
parent
6897e1f72c
commit
b095443498
13 changed files with 142 additions and 167 deletions
70
README.md
70
README.md
|
|
@ -1,48 +1,28 @@
|
|||
# ADS-B Exchange feed client
|
||||
# ADS-B.FI feed client
|
||||
|
||||
- These scripts aid in setting up your current ADS-B receiver to feed ADS-B Exchange.
|
||||
- These scripts aid in setting up your current ADS-B receiver to feed ADS-B.FI.
|
||||
- They will not disrupt any existing feed clients already present
|
||||
|
||||
## 1: Find coordinates / elevation:
|
||||
|
||||
<https://www.freemaptools.com/elevation-finder.htm>
|
||||
|
||||
## 2: Install the adsbexchange feed client
|
||||
## 2: Install the adsbfi feed client
|
||||
|
||||
```
|
||||
curl -L -o /tmp/axfeed.sh https://adsbexchange.com/feed.sh
|
||||
curl -L -o /tmp/axfeed.sh https://raw.githubusercontent.com/d4rken/adsb-fi-scripts/master/install.sh
|
||||
sudo bash /tmp/axfeed.sh
|
||||
```
|
||||
|
||||
## 3: Check these two URLs to check if your feed is working
|
||||
|
||||
- <https://www.adsbexchange.com/myip>
|
||||
- <https://map.adsbexchange.com/mlat-map>
|
||||
|
||||
## 4: Optional: Install the stats package for an online map that shows only planes received by you:
|
||||
|
||||
```
|
||||
curl -L -o /tmp/axstats.sh https://adsbexchange.com/stats.sh
|
||||
sudo bash /tmp/axstats.sh
|
||||
|
||||
adsbexchange-showurl
|
||||
```
|
||||
|
||||
### Optional: local interface for your data http://192.168.X.XX/adsbx
|
||||
|
||||
Install / Update:
|
||||
```
|
||||
sudo bash /usr/local/share/adsbexchange/git/install-or-update-interface.sh
|
||||
```
|
||||
Remove:
|
||||
```
|
||||
sudo bash /usr/local/share/tar1090/uninstall.sh adsbx
|
||||
```
|
||||
- <https://www.adsb.fi/myip>
|
||||
- <https://map.adsb.fi/mlat-map>
|
||||
|
||||
### Update the feed client without reconfiguring
|
||||
|
||||
```
|
||||
curl -L -o /tmp/axupdate.sh https://adsbexchange.com/feed-update.sh
|
||||
curl -L -o /tmp/axupdate.sh https://raw.githubusercontent.com/d4rken/adsb-fi-scripts/master/install-or-update-interface.sh
|
||||
sudo bash /tmp/axupdate.sh
|
||||
```
|
||||
|
||||
|
|
@ -50,15 +30,15 @@ sudo bash /tmp/axupdate.sh
|
|||
### If you encounter issues, please do a reboot and then supply these logs on the forum (last 20 lines for each is sufficient):
|
||||
|
||||
```
|
||||
sudo journalctl -u adsbexchange-feed --no-pager
|
||||
sudo journalctl -u adsbexchange-mlat --no-pager
|
||||
sudo journalctl -u adsbfi-feed --no-pager
|
||||
sudo journalctl -u adsbfi-mlat --no-pager
|
||||
```
|
||||
|
||||
|
||||
### Display the configuration
|
||||
|
||||
```
|
||||
cat /etc/default/adsbexchange
|
||||
cat /etc/default/adsbfi
|
||||
```
|
||||
|
||||
### Changing the configuration
|
||||
|
|
@ -68,54 +48,50 @@ If the client is up to date it should not take as long as the original installat
|
|||
otherwise this will also update the client which will take a moment.
|
||||
|
||||
```
|
||||
curl -L -o /tmp/axfeed.sh https://adsbexchange.com/feed.sh
|
||||
curl -L -o /tmp/axfeed.sh https://raw.githubusercontent.com/d4rken/adsb-fi-scripts/master/install.sh
|
||||
sudo bash /tmp/axfeed.sh
|
||||
```
|
||||
|
||||
### Disable / Enable adsbexchange MLAT-results in your main decoder interface (readsb / dump1090-fa)
|
||||
### Disable / Enable adsb.fi MLAT-results in your main decoder interface (readsb / dump1090-fa)
|
||||
|
||||
- Disable:
|
||||
|
||||
```
|
||||
sudo sed --follow-symlinks -i -e 's/RESULTS=.*/RESULTS=""/' /etc/default/adsbexchange
|
||||
sudo systemctl restart adsbexchange-mlat
|
||||
sudo sed --follow-symlinks -i -e 's/RESULTS=.*/RESULTS=""/' /etc/default/adsbfi
|
||||
sudo systemctl restart adsbfi-mlat
|
||||
```
|
||||
- Enable:
|
||||
|
||||
```
|
||||
sudo sed --follow-symlinks -i -e 's/RESULTS=.*/RESULTS="--results beast,connect,127.0.0.1:30104"/' /etc/default/adsbexchange
|
||||
sudo systemctl restart adsbexchange-mlat
|
||||
sudo sed --follow-symlinks -i -e 's/RESULTS=.*/RESULTS="--results beast,connect,127.0.0.1:30104"/' /etc/default/adsbfi
|
||||
sudo systemctl restart adsbfi-mlat
|
||||
```
|
||||
|
||||
### Other device as a data source (networked standalone receivers):
|
||||
|
||||
https://github.com/adsbxchange/wiki/wiki/Datasource-other-device
|
||||
|
||||
### Restart
|
||||
|
||||
```
|
||||
sudo systemctl restart adsbexchange-feed
|
||||
sudo systemctl restart adsbexchange-mlat
|
||||
sudo systemctl restart adsbfi-feed
|
||||
sudo systemctl restart adsbfi-mlat
|
||||
```
|
||||
|
||||
|
||||
### Systemd Status
|
||||
|
||||
```
|
||||
sudo systemctl status adsbexchange-mlat
|
||||
sudo systemctl status adsbexchange-feed
|
||||
sudo systemctl status adsbfi-mlat
|
||||
sudo systemctl status adsbfi-feed
|
||||
```
|
||||
|
||||
|
||||
### Removal / disabling the services:
|
||||
|
||||
```
|
||||
sudo bash /usr/local/share/adsbexchange/uninstall.sh
|
||||
sudo bash /usr/local/share/adsbfi/uninstall.sh
|
||||
```
|
||||
|
||||
If the above doesn't work, you may be using an old version that didn't have the uninstall script, just disable the services and the scripts won't run anymore:
|
||||
|
||||
```
|
||||
sudo systemctl disable --now adsbexchange-feed
|
||||
sudo systemctl disable --now adsbexchange-mlat
|
||||
sudo systemctl disable --now adsbfi-feed
|
||||
sudo systemctl disable --now adsbfi-mlat
|
||||
```
|
||||
|
|
|
|||
22
configure.sh
22
configure.sh
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
#####################################################################################
|
||||
# ADS-B EXCHANGE SETUP SCRIPT #
|
||||
# ADS-B.FI SETUP SCRIPT #
|
||||
#####################################################################################
|
||||
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
|
||||
# #
|
||||
|
|
@ -31,7 +31,7 @@ set -e
|
|||
trap 'echo "[ERROR] Error in line $LINENO when executing: $BASH_COMMAND"' ERR
|
||||
renice 10 $$ &>/dev/null
|
||||
|
||||
IPATH=/usr/local/share/adsbexchange
|
||||
IPATH=/usr/local/share/adsbfi
|
||||
|
||||
function abort() {
|
||||
echo ------------
|
||||
|
|
@ -43,13 +43,13 @@ function abort() {
|
|||
|
||||
## WHIPTAIL DIALOGS
|
||||
|
||||
BACKTITLETEXT="ADS-B Exchange Setup Script"
|
||||
BACKTITLETEXT="ADS-B.FI Setup Script"
|
||||
|
||||
whiptail --backtitle "$BACKTITLETEXT" --title "$BACKTITLETEXT" --yesno "Thanks for choosing to share your data with ADS-B Exchange!\n\nADSBexchange.com is a co-op of ADS-B/Mode S/MLAT feeders from around the world. This script will configure your current your ADS-B receiver to share your feeders data with ADS-B Exchange.\n\nWould you like to continue setup?" 13 78 || abort
|
||||
whiptail --backtitle "$BACKTITLETEXT" --title "$BACKTITLETEXT" --yesno "Thanks for choosing to share your data with ADS-B.FI!\n\nadsb.fi is a co-op of ADS-B/Mode S/MLAT feeders from around the world. This script will configure your current your ADS-B receiver to share your feeders data with ADS-B.FI.\n\nWould you like to continue setup?" 13 78 || abort
|
||||
|
||||
ADSBEXCHANGEUSERNAME=$(whiptail --backtitle "$BACKTITLETEXT" --title "Feeder MLAT Name" --nocancel --inputbox "\nPlease enter a unique name to be shown on the MLAT map (map.adsbexchange.com/mlat-map)(the pin will be offset for privacy)\n\nExample: \"william34-london\", \"william34-jersey\", etc.\nDisable MLAT: enter a zero: 0" 12 78 3>&1 1>&2 2>&3) || abort
|
||||
ADSBFIUSERNAME=$(whiptail --backtitle "$BACKTITLETEXT" --title "Feeder MLAT Name" --nocancel --inputbox "\nPlease enter a unique name to be shown on the MLAT map (map.adsb.fi/mlat-map)(the pin will be offset for privacy)\n\nExample: \"william34-london\", \"william34-jersey\", etc.\nDisable MLAT: enter a zero: 0" 12 78 3>&1 1>&2 2>&3) || abort
|
||||
|
||||
NOSPACENAME="$(echo -n -e "${ADSBEXCHANGEUSERNAME}" | tr -c '[a-zA-Z0-9]_\- ' '_')"
|
||||
NOSPACENAME="$(echo -n -e "${ADSBFIUSERNAME}" | tr -c '[a-zA-Z0-9]_\- ' '_')"
|
||||
|
||||
if [[ "$NOSPACENAME" != 0 ]]; then
|
||||
whiptail --backtitle "$BACKTITLETEXT" --title "$BACKTITLETEXT" \
|
||||
|
|
@ -111,12 +111,12 @@ if [[ $(hostname) == "radarcape" ]] || pgrep rcd &>/dev/null; then
|
|||
INPUT_TYPE="radarcape_gps"
|
||||
fi
|
||||
|
||||
tee /etc/default/adsbexchange >/dev/null <<EOF
|
||||
tee /etc/default/adsbfi >/dev/null <<EOF
|
||||
INPUT="$INPUT"
|
||||
REDUCE_INTERVAL="0.5"
|
||||
|
||||
# feed name for checking MLAT sync (adsbx.org/sync)
|
||||
# also displayed on the MLAT map: map.adsbexchange.com/mlat-map
|
||||
# feed name for checking MLAT sync (adsb.fi/sync)
|
||||
# also displayed on the MLAT map: map.adsb.fi/mlat-map
|
||||
USER="$NOSPACENAME"
|
||||
|
||||
LATITUDE="$RECEIVERLATITUDE"
|
||||
|
|
@ -137,8 +137,8 @@ RESULTS4="--results beast,connect,127.0.0.1:30154"
|
|||
PRIVACY=""
|
||||
INPUT_TYPE="$INPUT_TYPE"
|
||||
|
||||
MLATSERVER="feed.adsbexchange.com:31090"
|
||||
TARGET="--net-connector feed1.adsbexchange.com,30004,beast_reduce_out,feed2.adsbexchange.com,64004"
|
||||
MLATSERVER="feed.adsb.fi:31090"
|
||||
TARGET="--net-connector feed.adsb.fi,30004,beast_reduce_out,feed.adsb.fi,64004"
|
||||
NET_OPTIONS="--net-heartbeat 60 --net-ro-size 1280 --net-ro-interval 0.2 --net-ro-port 0 --net-sbs-port 0 --net-bi-port 30154 --net-bo-port 0 --net-ri-port 0 --write-json-every 1"
|
||||
JSON_OPTIONS="--max-range 450 --json-location-accuracy 2 --range-outline-hours 24"
|
||||
EOF
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
#!/bin/bash
|
||||
|
||||
if [ -f /boot/adsb-config.txt ]; then
|
||||
UUID_FILE="/boot/adsbx-uuid"
|
||||
UUID_FILE="/boot/adsbfi-uuid"
|
||||
else
|
||||
mkdir -p /usr/local/share/adsbexchange
|
||||
UUID_FILE="/usr/local/share/adsbexchange/adsbx-uuid"
|
||||
mkdir -p /usr/local/share/adsbfi
|
||||
UUID_FILE="/usr/local/share/adsbfi/adsbfi-uuid"
|
||||
# move old file position
|
||||
if [ -f /boot/adsbx-uuid ]; then
|
||||
mv -f /boot/adsbx-uuid $UUID_FILE
|
||||
if [ -f /boot/adsbfi-uuid ]; then
|
||||
mv -f /boot/adsbfi-uuid $UUID_FILE
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -23,4 +23,4 @@ GIT="/usr/local/share/tar1090/git"
|
|||
|
||||
getGIT "$REPO" "$BRANCH" "$GIT"
|
||||
|
||||
bash "$GIT/install.sh" "/run/adsbexchange-feed" "adsbx"
|
||||
bash "$GIT/install.sh" "/run/adsbfi-feed" "adsbfi"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
REPO="https://github.com/adsbexchange/feedclient.git"
|
||||
REPO="https://github.com/d4rken/adsb-fi-scripts.git"
|
||||
BRANCH="master"
|
||||
IPATH=/usr/local/share/adsbexchange
|
||||
IPATH=/usr/local/share/adsbfi
|
||||
mkdir -p $IPATH
|
||||
|
||||
if [ "$(id -u)" != "0" ]; then
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
|
||||
[Unit]
|
||||
Description=adsbexchange-feed
|
||||
Description=adsb.fi-feed
|
||||
Wants=network.target
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
User=adsbexchange
|
||||
RuntimeDirectory=adsbexchange-feed
|
||||
ExecStart=/usr/local/share/adsbexchange/adsbexchange-feed.sh
|
||||
User=adsbfi
|
||||
RuntimeDirectory=adsbfi-feed
|
||||
ExecStart=/usr/local/share/adsbfi/adsbfi-feed.sh
|
||||
Type=simple
|
||||
Restart=always
|
||||
RestartSec=30
|
||||
StartLimitInterval=1
|
||||
StartLimitBurst=100
|
||||
SyslogIdentifier=adsbexchange-feed
|
||||
SyslogIdentifier=adsbfi-feed
|
||||
Nice=-1
|
||||
|
||||
[Install]
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
#!/bin/bash
|
||||
|
||||
if grep -qs -e 'LATITUDE' /boot/adsb-config.txt &>/dev/null && [[ -f /boot/adsbx-env ]]; then
|
||||
if grep -qs -e 'LATITUDE' /boot/adsb-config.txt &>/dev/null && [[ -f /boot/adsbfi-env ]]; then
|
||||
source /boot/adsb-config.txt
|
||||
source /boot/adsbx-env
|
||||
source /boot/adsbfi-env
|
||||
else
|
||||
source /etc/default/adsbexchange
|
||||
source /etc/default/adsbfi
|
||||
fi
|
||||
|
||||
if ! [[ -d /run/adsbexchange-feed/ ]]; then
|
||||
mkdir -p /run/adsbexchange-feed
|
||||
if ! [[ -d /run/adsbfi-feed/ ]]; then
|
||||
mkdir -p /run/adsbfi-feed
|
||||
fi
|
||||
|
||||
if [[ -z $INPUT ]]; then
|
||||
|
|
@ -28,8 +28,8 @@ UAT_PORT=$(echo $UAT_INPUT | cut -d: -f2)
|
|||
UAT_SOURCE="--net-connector $UAT_IP,$UAT_PORT,uat_in,silent_fail"
|
||||
|
||||
|
||||
exec /usr/local/share/adsbexchange/feed-adsbx --net --net-only --quiet \
|
||||
--write-json /run/adsbexchange-feed \
|
||||
exec /usr/local/share/adsbfi/feed-adsbfi --net --net-only --quiet \
|
||||
--write-json /run/adsbfi-feed \
|
||||
--net-beast-reduce-interval $REDUCE_INTERVAL \
|
||||
$TARGET $NET_OPTIONS \
|
||||
--lat "$LATITUDE" --lon "$LONGITUDE" \
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
|
||||
[Unit]
|
||||
Description=adsbexchange-mlat
|
||||
Description=adsbfi-mlat
|
||||
Wants=network.target
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
User=adsbexchange
|
||||
ExecStart=/usr/local/share/adsbexchange/adsbexchange-mlat.sh
|
||||
User=adsbfi
|
||||
ExecStart=/usr/local/share/adsbfi/adsbfi-mlat.sh
|
||||
Type=simple
|
||||
Restart=always
|
||||
RestartSec=30
|
||||
StartLimitInterval=1
|
||||
StartLimitBurst=100
|
||||
SyslogIdentifier=adsbexchange-mlat
|
||||
SyslogIdentifier=adsbfi-mlat
|
||||
Nice=-1
|
||||
|
||||
[Install]
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
#!/bin/bash
|
||||
|
||||
if grep -qs -e 'LATITUDE' /boot/adsb-config.txt &>/dev/null && [[ -f /boot/adsbx-env ]]; then
|
||||
if grep -qs -e 'LATITUDE' /boot/adsb-config.txt &>/dev/null && [[ -f /boot/adsbfi-env ]]; then
|
||||
source /boot/adsb-config.txt
|
||||
source /boot/adsbx-env
|
||||
source /boot/adsbfi-env
|
||||
else
|
||||
source /etc/default/adsbexchange
|
||||
source /etc/default/adsbfi
|
||||
fi
|
||||
|
||||
if [[ "$LATITUDE" == 0 ]] || [[ "$LONGITUDE" == 0 ]] || [[ "$USER" == 0 ]] || [[ "$USER" == "disable" ]]; then
|
||||
|
|
@ -23,7 +23,7 @@ while ! nc -z "$INPUT_IP" "$INPUT_PORT" && command -v nc &>/dev/null; do
|
|||
sleep 10
|
||||
done
|
||||
|
||||
exec /usr/local/share/adsbexchange/venv/bin/mlat-client \
|
||||
exec /usr/local/share/adsbfi/venv/bin/mlat-client \
|
||||
--input-type "$INPUT_TYPE" --no-udp \
|
||||
--input-connect "$INPUT" \
|
||||
--server "$MLATSERVER" \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/bash
|
||||
SERVICE="/lib/systemd/system/adsbexchange-mlat2.service"
|
||||
SERVICE="/lib/systemd/system/adsbfi-mlat2.service"
|
||||
|
||||
if [[ -z ${1} ]]; then
|
||||
echo --------------
|
||||
|
|
@ -9,17 +9,17 @@ fi
|
|||
|
||||
cat >"$SERVICE" <<"EOF"
|
||||
[Unit]
|
||||
Description=adsbexchange-mlat2
|
||||
Description=adsbfi-mlat2
|
||||
Wants=network.target
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
User=adsbexchange
|
||||
EnvironmentFile=/etc/default/adsbexchange
|
||||
ExecStart=/usr/local/share/adsbexchange/venv/bin/mlat-client \
|
||||
User=adsbfi
|
||||
EnvironmentFile=/etc/default/adsbfi
|
||||
ExecStart=/usr/local/share/adsbfi/venv/bin/mlat-client \
|
||||
--input-type $INPUT_TYPE --no-udp \
|
||||
--input-connect $INPUT \
|
||||
--server feed.adsbexchange.com:SERVERPORT \
|
||||
--server feed.adsb.fi:SERVERPORT \
|
||||
--user $USER \
|
||||
--lat $LATITUDE \
|
||||
--lon $LONGITUDE \
|
||||
|
|
@ -32,7 +32,7 @@ Restart=always
|
|||
RestartSec=30
|
||||
StartLimitInterval=1
|
||||
StartLimitBurst=100
|
||||
SyslogIdentifier=adsbexchange-mlat2
|
||||
SyslogIdentifier=adsbfi-mlat2
|
||||
Nice=-1
|
||||
|
||||
[Install]
|
||||
|
|
@ -40,7 +40,7 @@ WantedBy=default.target
|
|||
EOF
|
||||
|
||||
if [[ -f /boot/adsb-config.txt ]]; then
|
||||
sed -i -e 's#EnvironmentFile.*#EnvironmentFile=/boot/adsbx-env\nEnvironmentFile=/boot/adsb-config.txt#' "$SERVICE"
|
||||
sed -i -e 's#EnvironmentFile.*#EnvironmentFile=/boot/adsbfi-env\nEnvironmentFile=/boot/adsb-config.txt#' "$SERVICE"
|
||||
fi
|
||||
|
||||
sed -i -e "s/SERVERPORT/${1}/" "$SERVICE"
|
||||
|
|
@ -48,5 +48,5 @@ if [[ -n ${2} ]]; then
|
|||
sed -i -e "s/\$RESULTS/${2}/" "$SERVICE"
|
||||
fi
|
||||
|
||||
systemctl enable adsbexchange-mlat2
|
||||
systemctl restart adsbexchange-mlat2
|
||||
systemctl enable adsbfi-mlat2
|
||||
systemctl restart adsbfi-mlat2
|
||||
|
|
|
|||
10
setup.sh
10
setup.sh
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
#####################################################################################
|
||||
# ADS-B EXCHANGE SETUP SCRIPT #
|
||||
# ADS-B.FI SETUP SCRIPT #
|
||||
#####################################################################################
|
||||
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
|
||||
# #
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
set -e
|
||||
|
||||
IPATH=/usr/local/share/adsbexchange
|
||||
IPATH=/usr/local/share/adsbfi
|
||||
|
||||
## we need to install stuff that require root, check for that
|
||||
if [ "$(id -u)" != "0" ]; then
|
||||
|
|
@ -43,8 +43,8 @@ fi
|
|||
|
||||
if [ -f /boot/adsb-config.txt ]; then
|
||||
echo --------
|
||||
echo "You are using the adsbx image, the feed setup script does not need to be installed."
|
||||
echo "You should already be feeding, check here: https://adsbexchange.com/myip/"
|
||||
echo "You are using the adsb.fi image, the feed setup script does not need to be installed."
|
||||
echo "You should already be feeding, check here: https://adsb.fi/myip/"
|
||||
echo "If the feed isn't working, check/correct the configuration using nano:"
|
||||
echo --------
|
||||
echo "sudo nano /boot/adsb-config.txt"
|
||||
|
|
@ -57,7 +57,7 @@ fi
|
|||
|
||||
bash "$IPATH/git/configure.sh"
|
||||
|
||||
whiptail --backtitle "$BACKTITLETEXT" --title "$BACKTITLETEXT" --yesno "We are now ready to begin setting up your receiver to feed ADS-B Exchange.\n\nDo you wish to proceed?" 9 78 || exit 1
|
||||
whiptail --backtitle "$BACKTITLETEXT" --title "$BACKTITLETEXT" --yesno "We are now ready to begin setting up your receiver to feed ADS-B.FI.\n\nDo you wish to proceed?" 9 78 || exit 1
|
||||
|
||||
bash "$IPATH/git/update.sh"
|
||||
|
||||
|
|
|
|||
24
uninstall.sh
24
uninstall.sh
|
|
@ -1,26 +1,26 @@
|
|||
#!/bin/bash
|
||||
set -x
|
||||
|
||||
IPATH=/usr/local/share/adsbexchange
|
||||
IPATH=/usr/local/share/adsbfi
|
||||
|
||||
systemctl disable --now adsbexchange-mlat
|
||||
systemctl disable --now adsbexchange-mlat2 &>/dev/null
|
||||
systemctl disable --now adsbexchange-feed
|
||||
systemctl disable --now adsbfi-mlat
|
||||
systemctl disable --now adsbfi-mlat2 &>/dev/null
|
||||
systemctl disable --now adsbfi-feed
|
||||
|
||||
if [[ -d /usr/local/share/tar1090/html-adsbx ]]; then
|
||||
bash /usr/local/share/tar1090/uninstall.sh adsbx
|
||||
if [[ -d /usr/local/share/tar1090/html-adsbfi ]]; then
|
||||
bash /usr/local/share/tar1090/uninstall.sh adsbfi
|
||||
fi
|
||||
|
||||
rm -f /lib/systemd/system/adsbexchange-mlat.service
|
||||
rm -f /lib/systemd/system/adsbexchange-mlat2.service
|
||||
rm -f /lib/systemd/system/adsbexchange-feed.service
|
||||
rm -f /lib/systemd/system/adsbfi-mlat.service
|
||||
rm -f /lib/systemd/system/adsbfi-mlat2.service
|
||||
rm -f /lib/systemd/system/adsbfi-feed.service
|
||||
|
||||
cp -f "$IPATH/adsbx-uuid" /tmp/adsbx-uuid
|
||||
cp -f "$IPATH/adsbfi-uuid" /tmp/adsbfi-uuid
|
||||
rm -rf "$IPATH"
|
||||
mkdir -p "$IPATH"
|
||||
mv -f /tmp/adsbx-uuid "$IPATH/adsbx-uuid"
|
||||
mv -f /tmp/adsbfi-uuid "$IPATH/adsbfi-uuid"
|
||||
|
||||
set +x
|
||||
|
||||
echo -----
|
||||
echo "adsbexchange feed scripts have been uninstalled!"
|
||||
echo "adsb.fi feed scripts have been uninstalled!"
|
||||
|
|
|
|||
107
update.sh
107
update.sh
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
#####################################################################################
|
||||
# ADS-B EXCHANGE SETUP SCRIPT #
|
||||
# ADS-B.FI SETUP SCRIPT #
|
||||
#####################################################################################
|
||||
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
|
||||
# #
|
||||
|
|
@ -44,7 +44,7 @@ fi
|
|||
|
||||
if [ -f /boot/adsb-config.txt ]; then
|
||||
echo --------
|
||||
echo "You are using the adsbx image, the feed setup script does not need to be installed."
|
||||
echo "You are using the adsb.fi image, the feed setup script does not need to be installed."
|
||||
echo --------
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -95,10 +95,10 @@ function getGIT() {
|
|||
rm -rf "$tmp" "$tmp.folder"; return 1
|
||||
}
|
||||
|
||||
REPO="https://github.com/adsbexchange/feedclient.git"
|
||||
REPO="https://github.com/d4rken/adsb-fi-scripts.git"
|
||||
BRANCH="master"
|
||||
|
||||
IPATH=/usr/local/share/adsbexchange
|
||||
IPATH=/usr/local/share/adsbfi
|
||||
GIT="$IPATH/git"
|
||||
mkdir -p $IPATH
|
||||
|
||||
|
|
@ -123,11 +123,11 @@ fi
|
|||
|
||||
if [ -f /boot/adsb-config.txt ]; then
|
||||
source /boot/adsb-config.txt
|
||||
source /boot/adsbx-env
|
||||
source /boot/adsbfi-env
|
||||
else
|
||||
source /etc/default/adsbexchange
|
||||
if ! grep -qs -e UAT_INPUT /etc/default/adsbexchange; then
|
||||
cat >> /etc/default/adsbexchange <<"EOF"
|
||||
source /etc/default/adsbfi
|
||||
if ! grep -qs -e UAT_INPUT /etc/default/adsbfi; then
|
||||
cat >> /etc/default/adsbfi <<"EOF"
|
||||
|
||||
# this is the source for 978 data, use port 30978 from dump978 --raw-port
|
||||
# if you're not receiving 978, don't worry about it, not doing any harm!
|
||||
|
|
@ -150,12 +150,12 @@ else
|
|||
fi
|
||||
|
||||
# remove previously used folder to avoid confusion
|
||||
rm -rf /usr/local/share/adsb-exchange &>/dev/null
|
||||
rm -rf /usr/local/share/adsbfi &>/dev/null
|
||||
|
||||
cp "$GIT/uninstall.sh" "$IPATH"
|
||||
cp "$GIT"/scripts/*.sh "$IPATH"
|
||||
|
||||
UNAME=adsbexchange
|
||||
UNAME=adsbfi
|
||||
if ! id -u "${UNAME}" &>/dev/null
|
||||
then
|
||||
# 2nd syntax is for fedora / centos
|
||||
|
|
@ -182,16 +182,16 @@ echo
|
|||
bash "$IPATH/git/create-uuid.sh"
|
||||
|
||||
VENV=$IPATH/venv
|
||||
if [[ -f /usr/local/share/adsbexchange/venv/bin/python3.7 ]] && command -v python3.9 &>/dev/null;
|
||||
if [[ -f /usr/local/share/adsbfi/venv/bin/python3.7 ]] && command -v python3.9 &>/dev/null;
|
||||
then
|
||||
rm -rf "$VENV"
|
||||
fi
|
||||
|
||||
MLAT_REPO="https://github.com/adsbxchange/mlat-client.git"
|
||||
MLAT_REPO="https://github.com/adsbfichange/mlat-client.git"
|
||||
MLAT_BRANCH="master"
|
||||
MLAT_VERSION="$(git ls-remote $MLAT_REPO $MLAT_BRANCH | cut -f1 || echo $RANDOM-$RANDOM )"
|
||||
if [[ $REINSTALL != yes ]] && grep -e "$MLAT_VERSION" -qs $IPATH/mlat_version \
|
||||
&& grep -qs -e '#!' "$VENV/bin/mlat-client" && { systemctl is-active adsbexchange-mlat &>/dev/null || [[ "${MLAT_DISABLED}" == "1" ]]; }
|
||||
&& grep -qs -e '#!' "$VENV/bin/mlat-client" && { systemctl is-active adsbfi-mlat &>/dev/null || [[ "${MLAT_DISABLED}" == "1" ]]; }
|
||||
then
|
||||
echo
|
||||
echo "mlat-client already installed, git hash:"
|
||||
|
|
@ -232,50 +232,50 @@ else
|
|||
echo "--------------------"
|
||||
echo "Installing mlat-client failed, if there was an old version it has been restored."
|
||||
echo "Will continue installation to try and get at least the feed client working."
|
||||
echo "Please repot this error to the adsbexchange forums or discord."
|
||||
echo "Please repot this error to the adsbfi forums or discord."
|
||||
echo "--------------------"
|
||||
fi
|
||||
fi
|
||||
|
||||
echo 50
|
||||
|
||||
# copy adsbexchange-mlat service file
|
||||
cp "$GIT"/scripts/adsbexchange-mlat.service /lib/systemd/system
|
||||
# copy adsbfi-mlat service file
|
||||
cp "$GIT"/scripts/adsbfi-mlat.service /lib/systemd/system
|
||||
|
||||
echo 60
|
||||
|
||||
if ls -l /etc/systemd/system/adsbexchange-mlat.service 2>&1 | grep '/dev/null' &>/dev/null; then
|
||||
if ls -l /etc/systemd/system/adsbfi-mlat.service 2>&1 | grep '/dev/null' &>/dev/null; then
|
||||
echo "--------------------"
|
||||
echo "CAUTION, adsbexchange-mlat is masked and won't run!"
|
||||
echo "CAUTION, adsbfi-mlat is masked and won't run!"
|
||||
echo "If this is unexpected for you, please report this issue"
|
||||
echo "--------------------"
|
||||
sleep 3
|
||||
else
|
||||
if [[ "${MLAT_DISABLED}" == "1" ]]; then
|
||||
systemctl disable adsbexchange-mlat || true
|
||||
systemctl stop adsbexchange-mlat || true
|
||||
systemctl disable adsbfi-mlat || true
|
||||
systemctl stop adsbfi-mlat || true
|
||||
else
|
||||
# Enable adsbexchange-mlat service
|
||||
systemctl enable adsbexchange-mlat >> $LOGFILE || true
|
||||
# Start or restart adsbexchange-mlat service
|
||||
systemctl restart adsbexchange-mlat || true
|
||||
# Enable adsbfi-mlat service
|
||||
systemctl enable adsbfi-mlat >> $LOGFILE || true
|
||||
# Start or restart adsbfi-mlat service
|
||||
systemctl restart adsbfi-mlat || true
|
||||
fi
|
||||
fi
|
||||
|
||||
echo 70
|
||||
|
||||
# SETUP FEEDER TO SEND DUMP1090 DATA TO ADS-B EXCHANGE
|
||||
# SETUP FEEDER TO SEND DUMP1090 DATA TO ADS-B.FI
|
||||
|
||||
READSB_REPO="https://github.com/adsbxchange/readsb.git"
|
||||
READSB_REPO="https://github.com/wiedehopf/readsb.git"
|
||||
READSB_BRANCH="master"
|
||||
if grep -E 'wheezy|jessie' /etc/os-release -qs; then
|
||||
READSB_BRANCH="jessie"
|
||||
fi
|
||||
READSB_VERSION="$(git ls-remote $READSB_REPO $READSB_BRANCH | cut -f1 || echo $RANDOM-$RANDOM )"
|
||||
READSB_GIT="$IPATH/readsb-git"
|
||||
READSB_BIN="$IPATH/feed-adsbx"
|
||||
READSB_BIN="$IPATH/feed-adsbfi"
|
||||
if [[ $REINSTALL != yes ]] && grep -e "$READSB_VERSION" -qs $IPATH/readsb_version \
|
||||
&& "$READSB_BIN" -V && systemctl is-active adsbexchange-feed &>/dev/null
|
||||
&& "$READSB_BIN" -V && systemctl is-active adsbfi-feed &>/dev/null
|
||||
then
|
||||
echo
|
||||
echo "Feed client already installed, git hash:"
|
||||
|
|
@ -308,19 +308,19 @@ fi
|
|||
|
||||
#end compile readsb
|
||||
|
||||
cp "$GIT"/scripts/adsbexchange-feed.service /lib/systemd/system
|
||||
cp "$GIT"/scripts/adsbfi-feed.service /lib/systemd/system
|
||||
|
||||
echo 82
|
||||
|
||||
if ! ls -l /etc/systemd/system/adsbexchange-feed.service 2>&1 | grep '/dev/null' &>/dev/null; then
|
||||
# Enable adsbexchange-feed service
|
||||
systemctl enable adsbexchange-feed >> $LOGFILE || true
|
||||
if ! ls -l /etc/systemd/system/adsbfi-feed.service 2>&1 | grep '/dev/null' &>/dev/null; then
|
||||
# Enable adsbfi-feed service
|
||||
systemctl enable adsbfi-feed >> $LOGFILE || true
|
||||
echo 92
|
||||
# Start or restart adsbexchange-feed service
|
||||
systemctl restart adsbexchange-feed || true
|
||||
# Start or restart adsbfi-feed service
|
||||
systemctl restart adsbfi-feed || true
|
||||
else
|
||||
echo "--------------------"
|
||||
echo "CAUTION, adsbexchange-feed.service is masked and won't run!"
|
||||
echo "CAUTION, adsbfi-feed.service is masked and won't run!"
|
||||
echo "If this is unexpected for you, please report this issue"
|
||||
echo "--------------------"
|
||||
sleep 3
|
||||
|
|
@ -328,32 +328,32 @@ fi
|
|||
|
||||
echo 94
|
||||
|
||||
systemctl is-active adsbexchange-feed &>/dev/null || {
|
||||
systemctl is-active adsbfi-feed &>/dev/null || {
|
||||
rm -f $IPATH/readsb_version
|
||||
echo "---------------------------------"
|
||||
journalctl -u adsbexchange-feed | tail -n10
|
||||
journalctl -u adsbfi-feed | tail -n10
|
||||
echo "---------------------------------"
|
||||
echo "adsbexchange-feed service couldn't be started, please report this error to the adsbexchange forum or discord."
|
||||
echo "adsbfi-feed service couldn't be started, please report this error to the adsbfi forum or discord."
|
||||
echo "Try an copy as much of the output above and include it in your report, thank you!"
|
||||
echo "---------------------------------"
|
||||
exit 1
|
||||
}
|
||||
|
||||
echo 96
|
||||
[[ "${MLAT_DISABLED}" == "1" ]] || systemctl is-active adsbexchange-mlat &>/dev/null || {
|
||||
[[ "${MLAT_DISABLED}" == "1" ]] || systemctl is-active adsbfi-mlat &>/dev/null || {
|
||||
rm -f $IPATH/mlat_version
|
||||
echo "---------------------------------"
|
||||
journalctl -u adsbexchange-mlat | tail -n10
|
||||
journalctl -u adsbfi-mlat | tail -n10
|
||||
echo "---------------------------------"
|
||||
echo "adsbexchange-mlat service couldn't be started, please report this error to the adsbexchange forum or discord."
|
||||
echo "adsbfi-mlat service couldn't be started, please report this error to the adsb.fi discord."
|
||||
echo "Try an copy as much of the output above and include it in your report, thank you!"
|
||||
echo "---------------------------------"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Remove old method of starting the feed scripts if present from rc.local
|
||||
# Kill the old adsbexchange scripts in case they are still running from a previous install including spawned programs
|
||||
for name in adsbexchange-netcat_maint.sh adsbexchange-socat_maint.sh adsbexchange-mlat_maint.sh; do
|
||||
# Kill the old adsb.fi scripts in case they are still running from a previous install including spawned programs
|
||||
for name in adsbfi-netcat_maint.sh adsbfi-socat_maint.sh adsbfi-mlat_maint.sh; do
|
||||
if grep -qs -e "$name" /etc/rc.local; then
|
||||
sed -i -e "/$name/d" /etc/rc.local || true
|
||||
fi
|
||||
|
|
@ -363,13 +363,13 @@ for name in adsbexchange-netcat_maint.sh adsbexchange-socat_maint.sh adsbexchang
|
|||
fi
|
||||
done
|
||||
|
||||
# in case the mlat-client service using /etc/default/mlat-client as config is using adsbexchange as a host, disable the service
|
||||
if grep -qs 'SERVER_HOSTPORT.*feed.adsbexchange.com' /etc/default/mlat-client &>/dev/null; then
|
||||
# in case the mlat-client service using /etc/default/mlat-client as config is using adsb.fi as a host, disable the service
|
||||
if grep -qs 'SERVER_HOSTPORT.*feed.adsb.fi' /etc/default/mlat-client &>/dev/null; then
|
||||
systemctl disable --now mlat-client >> $LOGFILE 2>&1 || true
|
||||
fi
|
||||
|
||||
if [[ -f /etc/default/adsbexchange ]]; then
|
||||
sed -i -e 's/feed.adsbexchange.com,30004,beast_reduce_out,feed.adsbexchange.com,64004/feed1.adsbexchange.com,30004,beast_reduce_out,feed2.adsbexchange.com,64004/' /etc/default/adsbexchange || true
|
||||
if [[ -f /etc/default/adsbfi ]]; then
|
||||
sed -i -e 's/feed.adsb.fi,30004,beast_reduce_out,feed.adsb.fi,64004/feed.adsb.fi,30004,beast_reduce_out,feed.adsb.fi,64004/' /etc/default/adsbfi || true
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -380,19 +380,18 @@ echo "---------------------"
|
|||
## SETUP COMPLETE
|
||||
|
||||
ENDTEXT="
|
||||
Thanks for choosing to share your data with ADS-B Exchange!
|
||||
Thanks for choosing to share your data with ADS-B.FI!
|
||||
|
||||
If you're curious, check your feed status after 5 min:
|
||||
|
||||
https://adsbexchange.com/myip/
|
||||
http://adsbx.org/sync
|
||||
https://adsb.fi/myip/
|
||||
http://adsb.fi/sync
|
||||
|
||||
Question? Issues? Go here:
|
||||
https://www.adsbexchange.com/forum/threads/adsbexchange-setup-scripts.631609/
|
||||
https://discord.gg/n9dGbkTtZm
|
||||
|
||||
Webinterface to show the data transmitted? Run this command:
|
||||
sudo bash /usr/local/share/adsbexchange/git/install-or-update-interface.sh
|
||||
sudo bash /usr/local/share/adsbfi/git/install-or-update-interface.sh
|
||||
"
|
||||
|
||||
INPUT_IP=$(echo $INPUT | cut -d: -f1)
|
||||
|
|
@ -426,10 +425,10 @@ https://github.com/wiedehopf/adsb-scripts/wiki/Automatic-installation-for-readsb
|
|||
fi
|
||||
|
||||
if ! timeout 5 nc -z "$INPUT_IP" "$INPUT_PORT" && command -v nc &>/dev/null; then
|
||||
#whiptail --title "ADS-B Exchange Setup Script" --msgbox "$ENDTEXT2" 24 73
|
||||
#whiptail --title "ADS-B.FI Setup Script" --msgbox "$ENDTEXT2" 24 73
|
||||
echo -e "$ENDTEXT2"
|
||||
else
|
||||
# Display the thank you message box.
|
||||
#whiptail --title "ADS-B Exchange Setup Script" --msgbox "$ENDTEXT" 24 73
|
||||
#whiptail --title "ADS-B.FI Setup Script" --msgbox "$ENDTEXT" 24 73
|
||||
echo -e "$ENDTEXT"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue