Merge remote-tracking branch 'refs/remotes/origin/master' into upgrade

pull/113/head
Joe Prochazka 2016-02-22 16:56:47 -05:00
commit 3a486c2239
7 zmienionych plików z 29 dodań i 32 usunięć

Wyświetl plik

@ -4,6 +4,8 @@ This repository contains a set of scripts and files which can be used to setup a
receiver on a clean installation of a Debian derived operating system. The scripts are executed
in order by the main install script depending on the installation options choosen by the user.
Please note: As of February 2016, the scripts do not work when run on an SD card where the current PiAware image was installed. The scripts require a clean installation of a Debian derived operating system.
The ADS-B Receiver Project website is located at https://www.adsbreceiver.net.
### Obtaining And Using This Software
@ -56,3 +58,5 @@ At this time the following software can be installed using these scripts.
### Supported Operating Systems
The scripts and packages have been tested on most Debian Jessie based operating systems.
The scripts are NOT supported on existing PiAware *image based* installations. The PiAware image is still based on Raspbian Wheezey version which is missing some required libraries for dump1090-mutability installation.

Wyświetl plik

@ -148,10 +148,10 @@ ChangeConfig "BEAST_INPUT_PORT" "30104" "/etc/default/dump1090-mutability"
# Ask if dump1090-mutability should bind on all IP addresses.
echo -e "\033[33m"
echo "By default dump1090-mutability on binds to the localhost IP address of 127.0.0.1 which is a good thing."
echo "By default dump1090-mutability binds to the localhost IP address of 127.0.0.1 which is a good thing."
echo ""
echo "However..."
echo "Some people like for dump1090-mutability to bind on all available IP addresses for a mutitude of reasons."
echo "Some people like for dump1090-mutability to bind to all available IP addresses for a multitude of reasons."
echo "The scripts can bind dump190-mutability to all available IP addresses however this is not recommended"
echo "unless you understand the possible consequences of doing so."
echo -e "\033[37m"

Wyświetl plik

@ -48,11 +48,11 @@ echo "-------------------------------------------"
echo " Now ready to install ADS-B Portal."
echo "-------------------------------------------"
echo -e "\033[33mThe goal of the ADS-B Portal project is to create a very"
echo "light weight easy to manage web interface for dump-1090 installations"
echo "light weight easy to manage web interface for dump-1090 installations."
echo "This project is at the moment very young with only a few of the planned"
echo "featured currently available at this time."
echo "features currently available at this time."
echo ""
echo "https://github.com/jprochazka/dump1090-portal"
echo "https://github.com/jprochazka/adsb-receiver"
echo -e "\033[37m"
read -p "Press enter to continue..." CONTINUE
@ -72,16 +72,6 @@ CheckPackage libpython2.7
## SETUP THE PORTAL WEBSITE
if [ $(dpkg-query -W -f='${STATUS}' pfclient 2>/dev/null | grep -c "ok installed") -eq 1 ]; then
echo -e "\033[33m"
echo -e "Inserting the Planefinder ADS-B Client links...\033[37m"
PLACEHOLDER="<!-- Plane Finder ADS-B Client Link Placeholder -->"
IPADDRESS=`ip addr | grep 'state UP' -A2 | tail -n1 | awk -F'[/ ]+' '{print $3}'`
HTMLLINK="<li id=\"planefinder-link\"><a href=\"http://${IPADDRESS}:30053\">Plane Finder Client</a></li>"
sudo sed -i "s@${PLACEHOLDER}@${HTMLLINK}@g" ${HTMLDIR}/templates/default/master.tpl.php
fi
echo -e "\033[33m"
echo -e "Placing portal files in Lighttpd's root directory...\033[37m"
sudo cp -R ${HTMLDIR}/* ${DOCUMENTROOT}

Wyświetl plik

@ -78,7 +78,7 @@
<body>
<div class="container">
<form class="form-signin" method="post" action="login.php">
<h2 class="form-signin-heading">ADS-B Feeder Login</h2>
<h2 class="form-signin-heading">ADS-B Receiver Login</h2>
<div>
<label for="login" class="sr-only">Login</label>
<input type="text" id="login" name="login" class="form-control" placeholder="Login" required autofocus>

Wyświetl plik

@ -35,6 +35,9 @@
function display(&$pageData) {
$common = new Common($this);
// The Base URL of this page (needed for Plane Finder client link)
$pageData['baseurl'] = $common->getBaseUrl();
// Load the master template.
$master = $this->readTemplate('master.tpl');
@ -294,4 +297,4 @@
return $output;
}
}
?>
?>

Wyświetl plik

@ -52,7 +52,7 @@
{if setting:enableGraphs eq TRUE}<li id="graphs-link"><a href="/graphs.php">Performance Graphs</a></li>{/if}
{if setting:enableDump1090 eq TRUE}<li id="dump1090-link"><a href="/dump1090.php">Live Dump1090 Map</a></li>{/if}
{if setting:enableDump978 eq TRUE}<li id="dump978-link"><a href="/dump978.php">Live Dump978 Map</a></li>{/if}
{if setting:enablePfclient eq TRUE}<!-- Plane Finder ADS-B Client Link Placeholder -->{/if}
{if setting:enablePfclient eq TRUE}<li id="planefinder-link"><a href="{page:baseurl}:30053" target="_blank">Plane Finder Client</a></li>{/if}
</ul>
</div>
</div>

Wyświetl plik

@ -1,14 +1,14 @@
#!/bin/bash
#####################################################################################
# ADS-B FEEDER #
# ADS-B RECEIVER #
#####################################################################################
# #
# A set of scripts created to automate the process of installing the software #
# needed to setup a Mode S decoder as well as feeders which are capable of #
# sharing your ADS-B results with many of the most popular ADS-B aggregate sites. #
# #
# Project Hosted On GitHub: https://github.com/jprochazka/adsb-feeder #
# Project Hosted On GitHub: https://github.com/jprochazka/adsb-receiver #
# #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# #
@ -163,23 +163,23 @@ CheckPackage whiptail
##
# The title of the installer.
BACKTITLE="The ADS-B Feeder Project"
BACKTITLE="The ADS-B Receiver Project"
# The welcome message displayed when this scrip[t it first executed.
read -d '' WELCOME <<"EOF"
The ADS-B Project is a series of bash scripts and files which can be used to setup an ADS-B feeder on certain Debian derived operating system.
The ADS-B Project is a series of bash scripts and files which can be used to setup an ADS-B receiver on certain Debian derived operating system.
More information on the project can be found on GitHub.
https://github.com/jprochazka/adsb-feeder
https://github.com/jprochazka/adsb-receiver
Would you like to continue setup?
EOF
# Message displayed asking to update the operating system.
read -d '' UPDATEFIRST <<"EOF"
It is recommended that you update your system before building and/or installing any ADS-B feeder related packages. This script can do this for you at this time if you like.
It is recommended that you update your system before building and/or installing any ADS-B receiver related packages. This script can do this for you at this time if you like.
Update system before installing any ADS-B feeder related software?
Update system before installing any ADS-B receiver related software?
EOF
# Message displayed if dump1090-mutability is installed.
@ -224,13 +224,13 @@ ALLFEEDERSINSTALLED="It appears that all the feeders available for installation
# Message displayed asking if the user wishes to install the web portal.
read -d '' INSTALLWEBPORTAL <<"EOF"
The ADS-B Feeder Project Web Portal is a light weight web interface for dump-1090-mutability installations.
The ADS-B Receiver Project Web Portal is a light weight web interface for dump-1090-mutability installations.
Current features include the following:
Unified navigation between all web pages.
System and dump1090 performance graphs.
Would you like to install the ADS-B Feeder Project web portal on this device?
Would you like to install the ADS-B Receiver Project web portal on this device?
EOF
# Message to display if there is nothing to install or do.
@ -240,9 +240,9 @@ NOTHINGTODO="Nothing has been selected to be installed so the script will exit n
read -d '' INSTALLATIONCOMPLETE <<"EOF"
INSTALLATION COMPLETE
It is hoped these scripts and files were found useful while setting up your ADS-B Feeder. Feedback reguarding this software is always welcome. If you ran into and problems or wish to submit feed back feel free to do so on the project's GitHub site.
It is hoped these scripts and files were found useful while setting up your ADS-B Receiver. Feedback regarding this software is always welcome. If you ran into any problems or wish to submit feed back feel free to do so on the project's GitHub site.
https://github.com/jprochazka/adsb-feeder
https://github.com/jprochazka/adsb-receiver
EOF
##
@ -250,7 +250,7 @@ EOF
##
# Display the welcome message.
whiptail --backtitle "$BACKTITLE" --title "The ADS-B Feeder Project" --yesno "$WELCOME" 16 65
whiptail --backtitle "$BACKTITLE" --title "The ADS-B Receiver Project" --yesno "$WELCOME" 16 65
BEGININSTALLATION=$?
if [ $BEGININSTALLATION = 1 ]; then
@ -360,7 +360,7 @@ fi
## WEB PORTAL
# Ask if the web portal should be installed.
whiptail --backtitle "$BACKTITLE" --title "Install The ADS-B Feeder Project Web Portal" --yesno "$INSTALLWEBPORTAL" 8 78
whiptail --backtitle "$BACKTITLE" --title "Install The ADS-B Receiver Project Web Portal" --yesno "$INSTALLWEBPORTAL" 8 78
DOINSTALLWEBPORTAL=$?
## CONFIRMATION
@ -438,7 +438,7 @@ if [ $DUMP1090CHOICE = 0 ] || [ $DUMP978CHOICE = 0 || [ $DOINSTALLWEBPORTAL = 0
fi
if [ $DOINSTALLWEBPORTAL = 0 ]; then
CONFIRMATION="${CONFIRMATION}\n * ADS-B Feeder Project Web Portal"
CONFIRMATION="${CONFIRMATION}\n * ADS-B Receiver Project Web Portal"
fi
CONFIRMATION="${CONFIRMATION}\n"
fi