mirror
/
adsb-receiver
kopia lustrzana https://github.com/jprochazka/adsb-receiver
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #186 from jprochazka/2.1.0 

2.1.0
pull/192/head
Joe Prochazka 2016-05-10 13:07:32 -04:00
rodzic 22fcac3878 e082d6187d
commit 17250fc3b4
6 zmienionych plików z 127 dodań i 27 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

48
bash/decoders/dump1090-mutability.sh
Wyświetl plik

@ -50,6 +50,25 @@ echo "https://github.com/mutability/dump1090"
echo -e "\033[37m"
read -p "Press enter to continue..." CONTINUE
## ASK WHICH WEB SERVER TO INSTALL
# Commented out temporarily until choice has been added to
# the portal installations scipt as well.
#echo -e "\033[31m"
#echo "Select Web Server"
#echo -e "\033[33m"
#echo "Select the web server you wish to use."
#echo "Currently Lighttpd is the recommended web server."
#echo ""
#echo " 1) Lighttpd"
#echo " 2) Nginx"
#echo -e "\033[37m"
#read -p "Which web server do you wish to use? [1] " WEBSERVER
# For now we will force Lighttpd as the web server chosen.
WEBSERVER=1
## CHECK FOR PREREQUISITE PACKAGES
echo -e "\033[33m"
@ -64,7 +83,13 @@ CheckPackage rtl-sdr
CheckPackage librtlsdr-dev
CheckPackage libusb-1.0-0-dev
CheckPackage pkg-config
CheckPackage lighttpd
if [[ $WEBSERVER != "2" ]]; then
CheckPackage lighttpd
else
CheckPackage nginx
fi
CheckPackage fakeroot
## DOWNLOAD OR UPDATE THE DUMP1090-MUTABILITY SOURCE
@ -118,13 +143,22 @@ if [ $(dpkg-query -W -f='${STATUS}' dump1090-mutability 2>/dev/null | grep -c "o
kill -9 `ps --pid $$ -oppid=`; exit
fi
## CONFIGURE LIGHTTPD
## CONFIGURE THE WEB SERVER
echo -e "\033[33m"
echo "Configuring lighttpd..."
echo -e "\033[37m"
sudo lighty-enable-mod dump1090
sudo /etc/init.d/lighttpd force-reload
if [[ $WEBSERVER != "2" ]]; then
echo -e "\033[33m"
echo "Configuring lighttpd..."
echo -e "\033[37m"
sudo lighty-enable-mod dump1090
sudo /etc/init.d/lighttpd force-reload
else
echo -e "\033[33m"
echo "Configuring nginx..."
echo -e "\033[37m"
sudo rm /etc/nginx/sites-enabled/default
sudo ln -s /etc/nginx/sites-available/dump1090-mutability /etc/nginx/sites-enabled/dump1090-mutability
sudo /etc/init.d/nginx force-reload
fi
## DUMP1090-MUTABILITY POST INSTALLATION CONFIGURATION

14
bash/decoders/rtlsdr-ogn.sh
Wyświetl plik

@ -109,17 +109,15 @@ sudo chmod a+s rtlsdr-ogn
# Check if kernel v4.1 or higher is being used.
################################################
# ADD A WAY TO CHECK KERNEL #
# THIS WILL NOT WORK AND IS ONLY A PLACEHOLDER #
################################################
KERNEL=`uname -r`
VERSION="`echo $KERNEL | cut -d \. -f 1`.`echo $KERNEL | cut -d \. -f 2`"
if [[ `uname -r` == $SOMETHING ]]; then
# Kernel is version 4.1 or newer.
sudo mknod gpu_dev c 249 0
else
if [[ $VERSION < 4.1 ]]; then
# Kernel is older than version 4.1.
sudo mknod gpu_dev c 100 0
else
# Kernel is version 4.1 or newer.
sudo mknod gpu_dev c 249 0
fi
## CREATE THE CONFIGURATION FILE

49
bash/portal/install.sh
Wyświetl plik

@ -144,22 +144,61 @@ echo -e "\033[37m"
CheckPackage cron
CheckPackage collectd-core
CheckPackage rrdtool
CheckPackage lighttpd
CheckPackage php5-cgi
CheckPackage postfix
CheckPackage lighttpd
# Check if this is Ubuntu 16.04 LTS.
# This needs optimized and made to recognize releases made after 16.04 as well.
if [ -f /etc/lsb-release ]; then
. /etc/lsb-release
if [ $DISTRIB_ID == "Ubuntu" ] && [ $DISTRIB_RELEASE == "16.04" ]; then
CheckPackage php7.0-cgi
else
CheckPackage php5-cgi
fi
else
CheckPackage php5-cgi
fi
CheckPackage libpython2.7
if [[ $ADVANCED =~ ^[yY]$ ]]; then
if [[ $DATABASEENGINE == 2 ]]; then
CheckPackage sqlite3
CheckPackage php5-sqlite
CheckPackage sqlite3
# Check if this is Ubuntu 16.04 LTS.
# This needs optimized and made to recognize releases made after 16.04 as well.
if [ -f /etc/lsb-release ]; then
. /etc/lsb-release
if [ $DISTRIB_ID == "Ubuntu" ] && [ $DISTRIB_RELEASE == "16.04" ]; then
CheckPackage php7.0-sqlite
else
CheckPackage php5-sqlite
fi
else
CheckPackage php5-sqlite
fi
else
if [[ $LOCALDATABASE != 2 ]]; then
# Install MySQL locally.
CheckPackage mysql-server
fi
CheckPackage mysql-client
CheckPackage php5-mysql
CheckPackage python-mysqldb
# Check if this is Ubuntu 16.04 LTS.
# This needs optimized and made to recognize releases made after 16.04 as well.
if [ -f /etc/lsb-release ]; then
. /etc/lsb-release
if [ $DISTRIB_ID == "Ubuntu" ] && [ $DISTRIB_RELEASE == "16.04" ]; then
CheckPackage php7.0-mysql
else
CheckPackage php5-mysql
fi
else
CheckPackage php5-mysql
fi
fi
fi

1
build/portal/html/admin/index.php
Wyświetl plik

@ -523,6 +523,7 @@
<div class="panel panel-default">
<div class="panel-heading">Purge Positions</div>
<div class="panel-body">
<p>Current Database Size: <?php echo $common->getDatabaseSize("mb"); ?>MB</p>
<div class="form-group">
<label for="purgepositionspicker">Purge flight positions old than...</label><br />
<input type="text" class="form-control" id="purgepositionspicker" name="purgepositionspicker" autocomplete="off" <?php ($settings::db_driver == "xml" ? print ' disabled' : ''); ?>>

34
build/portal/html/classes/common.class.php
Wyświetl plik

@ -144,11 +144,11 @@
$dbh = NULL;
}
}
function deleteSetting($name) {
require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."classes".DIRECTORY_SEPARATOR."settings.class.php");
$settings = new settings();
if ($settings::db_driver == "xml") {
$xmlSettings = simplexml_load_file($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."data".DIRECTORY_SEPARATOR."settings.xml");
foreach($xmlSettings as $xmlSetting) {
@ -162,7 +162,7 @@
// PDO
require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."classes".DIRECTORY_SEPARATOR."common.class.php");
$common = new common();
$dbh = $common->pdoOpen();
$sql = "DELETE FROM ".$settings::db_prefix."settings WHERE name = :name";
$sth = $dbh->prepare($sql);
@ -285,5 +285,33 @@
'X-Mailer: PHP/'.phpversion();
return mail($to, $subject, $message, $headers);
}
// Get the size of the database.
function getDatabaseSize($measurment = "") {
$databaseSize = 0;
$dbh = $this->pdoOpen();
$sql = "SHOW TABLE STATUS";
$sth = $dbh->prepare($sql);
$sth->execute();
$databaseSize = $sth->fetch(PDO::FETCH_ASSOC)["Data_length"];
$sth = NULL;
$dbh = NULL;
switch ($measurment) {
case "kb":
return round($databaseSize / 1024, 2);
break;
case "mb":
return round($databaseSize / 1024 / 1024, 2);
break;
case "gb":
return round($databaseSize / 1024 / 1024 /1024, 2);
break;
case "tb":
return round($databaseSize / 1024 /1024 /1024 /1024, 2);
break;
default:
return $databaseSize;
}
}
}
?>

8
build/portal/html/templates/default/system.tpl
Wyświetl plik

@ -25,10 +25,10 @@
<h1>System Information</h1>
<h2>Aggregate Sites Statistics</h2>
<ul>
{if setting:enableFlightAwareLink eq TRUE}<li><a href="{page:flightAwareLink}">FlightAware Stats</a></li>{/if}
{if setting:enablePlaneFinderLink eq TRUE}<li><a href="{page:planeFinderLink}">Planefinder Stats</a></li>{/if}
{if setting:enableFlightRadar24Link eq TRUE}<li><a href="{page:flightRadar24Link}">Flightradar24 Stats</a></li>{/if}
{if setting:enableAdsbExchangeLink eq TRUE}<li><a href="{page:adsbExchangeLink}">ADS-B Exchange</a></li>{/if}
{if setting:enableFlightAwareLink eq TRUE}<li><a href="{page:flightAwareLink}" target="_blank">FlightAware Stats</a></li>{/if}
{if setting:enablePlaneFinderLink eq TRUE}<li><a href="{page:planeFinderLink}" target="_blank">Planefinder Stats</a></li>{/if}
{if setting:enableFlightRadar24Link eq TRUE}<li><a href="{page:flightRadar24Link}" target="_blank">Flightradar24 Stats</a></li>{/if}
{if setting:enableAdsbExchangeLink eq TRUE}<li><a href="{page:adsbExchangeLink}" target="_blank">ADS-B Exchange</a></li>{/if}
</ul>
<h2>System Charts</h2>
<div id="chart_div" style="width: 400px; height: 120px;"></div>