diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..e69de29b diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..dece0593 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +# Disable reminder in prompt +ignoredirmessage + +# ignore commit message +.gitcommit 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" 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 diff --git a/bash/tools/image_setup.sh b/bash/tools/image_setup.sh index ff869edc..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 ;; @@ -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. diff --git a/build/portal/html/admin/includes/footer.inc.php b/build/portal/html/admin/includes/footer.inc.php index 93060a94..b24ef5b3 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 + diff --git a/build/portal/html/dump978/config.js b/build/portal/html/dump978/config.js index bacd2b4a..d518a86e 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; // 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 ------------------------------------- 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.

- The ADS-B Receiver Project + CasjaysDev ADS-B Server

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. diff --git a/version.txt b/version.txt new file mode 100644 index 00000000..d80bdef8 --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ +202107312340-git