From 916f33e2d3124aeca934e9525628991aff61efad Mon Sep 17 00:00:00 2001 From: casjay Date: Mon, 31 Aug 2020 05:20:56 -0400 Subject: [PATCH 01/20] Update install.sh --- bash/portal/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash/portal/install.sh b/bash/portal/install.sh index 52db1235..d4b2a17d 100755 --- a/bash/portal/install.sh +++ b/bash/portal/install.sh @@ -244,7 +244,7 @@ fi DISTRO_PHP_VERSION="5" case $RECEIVER_OS_DISTRIBUTION in debian|raspbian) - if [[ $RECEIVER_OS_RELEASE -ge "9" ]]; then DISTRO_PHP_VERSION="7.0"; fi + if [[ $RECEIVER_OS_RELEASE -ge "9" ]]; then DISTRO_PHP_VERSION="7.3"; fi ;; ubuntu) if [ `bc -l <<< "$RECEIVER_OS_RELEASE >= 16.04"` -eq 1 ]; then DISTRO_PHP_VERSION="7.0"; fi From 34d07d3f45e27ade3b4bfe9240ec175a617ca64a Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 1 Sep 2020 17:04:24 -0400 Subject: [PATCH 02/20] Update image_setup.sh --- bash/tools/image_setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bash/tools/image_setup.sh b/bash/tools/image_setup.sh index ff869edc..5ab73eb2 100755 --- a/bash/tools/image_setup.sh +++ b/bash/tools/image_setup.sh @@ -187,8 +187,8 @@ CheckPackage lighttpd CheckPackage collectd-core CheckPackage rrdtool CheckPackage libpython2.7 -CheckPackage php7.0-cgi -CheckPackage php7.0-json +CheckPackage php7.3-cgi +CheckPackage php7.3-json ## PREVIOUS LOCALE SCRIPTING THAT SET LOCALE NO LONGER WORKS PROPERLY ON STRETCH. ## The scripting setting this using this script has been removed for now. From 382404575b6202d846842d0bdf494dbb8890b3d8 Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 1 Sep 2020 17:15:43 -0400 Subject: [PATCH 03/20] Update footer.inc.php --- build/portal/html/admin/includes/footer.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/portal/html/admin/includes/footer.inc.php b/build/portal/html/admin/includes/footer.inc.php index 93060a94..2a616092 100644 --- a/build/portal/html/admin/includes/footer.inc.php +++ b/build/portal/html/admin/includes/footer.inc.php @@ -4,9 +4,9 @@ - \ No newline at end of file + From ea4237f372ba7366e1c5ed9ff1f8b12d0ad8955d Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 1 Sep 2020 17:17:32 -0400 Subject: [PATCH 04/20] Update master.tpl --- build/portal/html/templates/default/master.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/portal/html/templates/default/master.tpl b/build/portal/html/templates/default/master.tpl index 56396206..a1a999c6 100644 --- a/build/portal/html/templates/default/master.tpl +++ b/build/portal/html/templates/default/master.tpl @@ -109,7 +109,7 @@ From 620352bfe60fcb38bd525699147c3b52e1fe79d5 Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 1 Sep 2020 17:17:54 -0400 Subject: [PATCH 05/20] Update footer.inc.php --- build/portal/html/admin/includes/footer.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/portal/html/admin/includes/footer.inc.php b/build/portal/html/admin/includes/footer.inc.php index 2a616092..b24ef5b3 100644 --- a/build/portal/html/admin/includes/footer.inc.php +++ b/build/portal/html/admin/includes/footer.inc.php @@ -4,7 +4,7 @@ From a769c81208a041fd0f1f280c4f53a771e030442a Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 1 Sep 2020 17:27:35 -0400 Subject: [PATCH 06/20] Update example.config --- example.config | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/example.config b/example.config index b44e5855..6135f402 100644 --- a/example.config +++ b/example.config @@ -70,7 +70,7 @@ RECEIVER_ALTITUDE="" # If dump1090-fa (fa) is selected PiAware must be installed as # well in order for dump1090-fa to run properly. -DUMP1090_FORK="mutability" +DUMP1090_FORK="dump1090-fa" # If set to true dump1090 will be upgraded to the latest available version. # @@ -138,7 +138,7 @@ DUMP1090_UNIT_OF_MEASUREMENT="imperial" # DUMP978 # --------------------------------------------------------------------------------- -DUMP978_INSTALL="false" +DUMP978_INSTALL="true" # The dump978 source code is not versioned with fixes and changes to the source # code directly commited to the master branch of the repoisitory when added. Since @@ -164,21 +164,21 @@ DUMP978_DEVICE_ID="1" # ADS-B Exchange # --------------------------------------------------------------------------------- -ADSBEXCHANGE_INSTALL="false" -ADSBEXCHANGE_UPGRADE="false" +ADSBEXCHANGE_INSTALL="true" +ADSBEXCHANGE_UPGRADE="true" # --------------------------------------------------------------------------------- # ADSBHub # --------------------------------------------------------------------------------- -ADSBHUB_INSTALL="false" +ADSBHUB_INSTALL="true" # The receiver name should be a unique name specific to this receiver which you can # use to identify your receiver on the ADS-B Exchange MLAT status pages. This # variable is required in order to setup the MLAT client to feed ADS-B Exchange # properly. -ADSBEXCHANGE_RECEIVER_USERNAME="I_DID_NOT_READ_THE_COMMENTS" +ADSBEXCHANGE_RECEIVER_USERNAME="${ADSBEXCHANGE_RECEIVER_USERNAME:-$(cat /dev/urandom | base64 | head -c 15)}" # --------------------------------------------------------------------------------- # FLIGHTRADAR24 FEEDER CLIENT @@ -189,7 +189,7 @@ ADSBEXCHANGE_RECEIVER_USERNAME="I_DID_NOT_READ_THE_COMMENTS" # to true then the interactive installation mode will be automatically enabled # for the entire installation process. -FLIGHTRADAR24_INSTALL="false" +FLIGHTRADAR24_INSTALL="true" # --------------------------------------------------------------------------------- # OPENSKY NETWORK FEEDER CLIENT @@ -208,7 +208,7 @@ OPENSKY_NETWORK_INSTALL="false" # Please note that if the FlightAware fork of dump1090 is chosen to be installed # PiAware will be installed reguardless of the option set here. -PIAWARE_INSTALL="false" +PIAWARE_INSTALL="true" PIAWARE_UPGRADE="true" # The variables PIAWARE_FLIGHTAWARE_LOGIN and PIAWARE_FLIGHTAWARE_PASSWORD are @@ -238,7 +238,7 @@ PIAWARE_FLIGHTAWARE_PASSWORD="" # Tcp Address: 127.0.0.1 # Tcp Port: 30005 -PLANEFINDER_INSTALL="false" +PLANEFINDER_INSTALL="true" PLANEFINDER_UPGRADE="true" # --------------------------------------------------------------------------------- @@ -271,7 +271,7 @@ WEBPORTAL_ADVANCED="false" # mysql : MySQL : http://www.mysql.com/ # sqlite : SQLite : http://sqlite.org/ -WEBPORTAL_DATABASE_ENGINE="" +WEBPORTAL_DATABASE_ENGINE="SQLite" # If you are using MySQL as your database engine you must specify if the database # server will be hosted locally on this device or at a remote location. From acd57ccb275eb0ceea4c77b83d59aea70bb3e3fc Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 1 Sep 2020 18:03:07 -0400 Subject: [PATCH 07/20] Update piaware.sh --- bash/feeders/piaware.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bash/feeders/piaware.sh b/bash/feeders/piaware.sh index 73614e27..c119e3d5 100755 --- a/bash/feeders/piaware.sh +++ b/bash/feeders/piaware.sh @@ -155,12 +155,12 @@ if [[ -n "${CPU_ARCHITECTURE}" ]] ; then # Execute build script. echo -e "\e[94m Executing the FlightAware PiAware client build script...\e[97m" echo "" - ./sensible-build.sh jessie + ./sensible-build.sh buster echo "" # Change to build script directory. echo -e "\e[94m Entering the FlightAware PiAware client build directory...\e[97m" - cd ${RECEIVER_BUILD_DIRECTORY}/piaware_builder/package-jessie 2>&1 + cd ${RECEIVER_BUILD_DIRECTORY}/piaware_builder/package-buster 2>&1 # Build binary package. echo -e "\e[94m Building the FlightAware PiAware client package...\e[97m" From a3519198ff7484a2cc27edce9f4295b5df628fa8 Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 1 Sep 2020 18:03:34 -0400 Subject: [PATCH 08/20] Update image_setup.sh --- bash/tools/image_setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bash/tools/image_setup.sh b/bash/tools/image_setup.sh index 5ab73eb2..3aaa5962 100755 --- a/bash/tools/image_setup.sh +++ b/bash/tools/image_setup.sh @@ -167,8 +167,8 @@ case ${DUMP1090OPTION} in cd ${RECEIVER_BUILD_DIRECTORY} 2>&1 git clone https://github.com/flightaware/piaware_builder.git cd ${RECEIVER_BUILD_DIRECTORY}/piaware_builder 2>&1 - ./sensible-build.sh jessie - cd ${RECEIVER_BUILD_DIRECTORY}/piaware_builder/package-jessie 2>&1 + ./sensible-build.sh buster + cd ${RECEIVER_BUILD_DIRECTORY}/piaware_builder/package-buster 2>&1 dpkg-buildpackage -b sudo dpkg -i ${RECEIVER_BUILD_DIRECTORY}/piaware_builder/piaware_*.deb ;; From 835730e1d3da552b486a87e969a4ecf29b55ff83 Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 1 Sep 2020 18:10:17 -0400 Subject: [PATCH 09/20] Update config.js --- build/portal/html/dump978/config.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build/portal/html/dump978/config.js b/build/portal/html/dump978/config.js index bacd2b4a..3f4ba635 100644 --- a/build/portal/html/dump978/config.js +++ b/build/portal/html/dump978/config.js @@ -26,18 +26,18 @@ ShowOtherUnits = true; // degrees. // Default center of the map. -DefaultCenterLat = 45.0; -DefaultCenterLon = 9.0; +DefaultCenterLat = 42.99106979370117; +DefaultCenterLon = -74.11241912841797; // The google maps zoom level, 0 - 16, lower is further out -DefaultZoomLvl = 7; +DefaultZoomLvl = 8; // Center marker. If dump1090 provides a receiver location, // that location is used and these settings are ignored. -SiteShow = false; // true to show a center marker -SiteLat = "41.3872537" -SiteLon = "-82.0769568" -SiteName = "My Radar Site"; // tooltip of the marker +SiteShow = True; // true to show a center marker +SiteLat = "42.99106979370117" +SiteLon = "-74.11241912841797" +SiteName = "CasjaysDev"; // tooltip of the marker // -- Marker settings ------------------------------------- From b20bd2ae16c4a69e671f1bd8fa6d7c555011cb2b Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 1 Sep 2020 18:15:31 -0400 Subject: [PATCH 10/20] Update index.php --- build/portal/html/install/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/portal/html/install/index.php b/build/portal/html/install/index.php index 24f64449..596a6d97 100644 --- a/build/portal/html/install/index.php +++ b/build/portal/html/install/index.php @@ -594,7 +594,7 @@ function formatOffset($offset) { -

ADS-B Receiver Portal Setup

+

CasjaysDev ADS-B Portal Setup

Setup of your ADS-B Receiver Web Portal is now complete.

For security reasons it is highly recommended that the installation files be deleted permanently from your device. @@ -606,7 +606,7 @@ function formatOffset($offset) {

Once you have done so you can log in and administrate your portal here.

If you experienced any issues or have any questions or suggestions you would like to make regarding this project - feel free to do so on the projects homepage located at https://www.adsbreceiver.net. + feel free to do so on the projects homepage located at CasjaysDev ADS-B.

Date: Tue, 1 Sep 2020 21:03:52 -0400 Subject: [PATCH 11/20] Update config.js --- build/portal/html/dump978/config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/portal/html/dump978/config.js b/build/portal/html/dump978/config.js index 3f4ba635..b643104e 100644 --- a/build/portal/html/dump978/config.js +++ b/build/portal/html/dump978/config.js @@ -26,15 +26,15 @@ ShowOtherUnits = true; // degrees. // Default center of the map. -DefaultCenterLat = 42.99106979370117; -DefaultCenterLon = -74.11241912841797; +DefaultCenterLat = "42.99106979370117"; +DefaultCenterLon = "-74.11241912841797"; // The google maps zoom level, 0 - 16, lower is further out DefaultZoomLvl = 8; // Center marker. If dump1090 provides a receiver location, // that location is used and these settings are ignored. -SiteShow = True; // true to show a center marker +SiteShow = true; // true to show a center marker SiteLat = "42.99106979370117" SiteLon = "-74.11241912841797" SiteName = "CasjaysDev"; // tooltip of the marker From 76dd124612f775ad43f52ff6626cdf85996a957e Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 1 Sep 2020 21:14:00 -0400 Subject: [PATCH 12/20] Update config.js --- build/portal/html/dump978/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/portal/html/dump978/config.js b/build/portal/html/dump978/config.js index b643104e..d518a86e 100644 --- a/build/portal/html/dump978/config.js +++ b/build/portal/html/dump978/config.js @@ -29,7 +29,7 @@ ShowOtherUnits = true; DefaultCenterLat = "42.99106979370117"; DefaultCenterLon = "-74.11241912841797"; // The google maps zoom level, 0 - 16, lower is further out -DefaultZoomLvl = 8; +DefaultZoomLvl = 7; // Center marker. If dump1090 provides a receiver location, // that location is used and these settings are ignored. From 225090e7758e60e1fc8bb17ddf4381970f07d49d Mon Sep 17 00:00:00 2001 From: casjay Date: Wed, 2 Sep 2020 01:43:33 -0400 Subject: [PATCH 13/20] Update master.tpl --- build/portal/html/templates/default/master.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/portal/html/templates/default/master.tpl b/build/portal/html/templates/default/master.tpl index a1a999c6..1be34fc6 100644 --- a/build/portal/html/templates/default/master.tpl +++ b/build/portal/html/templates/default/master.tpl @@ -61,7 +61,7 @@ {if setting:enableLinks eq TRUE} From 9642b83e8124220350807212dd040cdb21d958b3 Mon Sep 17 00:00:00 2001 From: casjay Date: Wed, 2 Sep 2020 01:46:54 -0400 Subject: [PATCH 14/20] Update master.tpl --- build/portal/html/templates/default/master.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/portal/html/templates/default/master.tpl b/build/portal/html/templates/default/master.tpl index 1be34fc6..a1a999c6 100644 --- a/build/portal/html/templates/default/master.tpl +++ b/build/portal/html/templates/default/master.tpl @@ -61,7 +61,7 @@ {if setting:enableLinks eq TRUE} From 3cdefc3d16bbca74e23eb237f57db836568baa4d Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 8 Feb 2021 15:57:29 -0500 Subject: [PATCH 15/20] =?UTF-8?q?=F0=9F=9A=80=20Version=20Bump:=2002082021?= =?UTF-8?q?1557-git=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- version.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 version.txt diff --git a/version.txt b/version.txt new file mode 100644 index 00000000..c91892e1 --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ +020820211557-git From aff0db0a167c25b4b197793fe354b4f0cac40ea2 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 8 Feb 2021 16:03:19 -0500 Subject: [PATCH 16/20] =?UTF-8?q?=F0=9F=9A=80=20Version=20Bump:=2002082021?= =?UTF-8?q?1603-git=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index c91892e1..cd7b277a 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -020820211557-git +020820211603-git From 92592dc35d696ed609a94bfcc8f40c15fab7a151 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 12 Mar 2021 15:40:21 -0500 Subject: [PATCH 17/20] =?UTF-8?q?=F0=9F=A6=88=F0=9F=8F=A0=E2=9D=97=20Well?= =?UTF-8?q?=20I=20did=20things=20-=20Hopefully=20nothing=20breaks=20?= =?UTF-8?q?=E2=9D=97=F0=9F=8F=A0=F0=9F=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +++ version.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..eb794e10 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +# Disable reminder in prompt +ignoredirmessage + diff --git a/version.txt b/version.txt index cd7b277a..444744ae 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -020820211603-git +031220211540-git From efc504644d1549c4b55f69d6953bda8bc441c635 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 31 Jul 2021 23:40:01 -0400 Subject: [PATCH 18/20] =?UTF-8?q?=E2=9C=94=EF=B8=8F=F0=9F=90=9B=20Changed:?= =?UTF-8?q?=20master=20branch=20to=20main=20=F0=9F=90=9B=E2=9C=94=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 444744ae..d80bdef8 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -031220211540-git +202107312340-git From fd79df7c02ec9814b0befcd7b0fa211db7a6e258 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 31 Jan 2022 20:40:48 -0500 Subject: [PATCH 19/20] =?UTF-8?q?=F0=9F=A4=96=20Added=20.gitcommit=20?= =?UTF-8?q?=F0=9F=A4=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index eb794e10..dece0593 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ # Disable reminder in prompt ignoredirmessage +# ignore commit message +.gitcommit From bf316f785ff228271519ca6782993cb0e9e05d34 Mon Sep 17 00:00:00 2001 From: casjay Date: Sat, 29 Jul 2023 12:26:46 -0400 Subject: [PATCH 20/20] =?UTF-8?q?=F0=9F=94=B5=20Added=20.gitattributes=20?= =?UTF-8?q?=F0=9F=94=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..e69de29b