Merge branch 'upstream'

This commit is contained in:
Oliver Jowett 2016-07-10 14:58:49 +01:00
commit bf2b8efee6
10 changed files with 43 additions and 134 deletions

3
debian/control vendored
View file

@ -9,7 +9,8 @@ Vcs-Git: https://github.com/mutability/dump1090.git
Package: dump1090-fa
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, python(>=2.5), cron | cron-daemon, curl, lighttpd
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lighttpd
Provides: fatsv-data-source
Description: ADS-B Ground Station System for RTL-SDR
Networked Aviation Mode S / ADS-B decoder/translator with RTL-SDR software
defined radio USB device support.

12
debian/cron-template vendored
View file

@ -1,12 +0,0 @@
## TEMPLATE FILE - This is used to create /etc/cron.d/dump1090-mutability ##
## The first three lines will be discarded ##
# Checks for updates to the VRS aircraft database once a day at around 5am;
# when an update is available, downloads it and regenerates the JSON data
# used by the webmap.
# NB: the minute value below is randomly generated on install, to avoid
# all installs hitting the server at the same time.
# m h dom mon dow user command
@MIN@ 5 @DOM@ * * @USER@ test -x /usr/share/dump1090-fa/update-aircraft-database.sh && /usr/share/dump1090-fa/update-aircraft-database.sh --log-to-file

View file

@ -8,5 +8,5 @@
RECEIVER_OPTIONS="--device-index 0 --gain -10 --ppm 0 --net-bo-port 30005"
DECODER_OPTIONS="--max-range 300"
NET_OPTIONS="--net --net-heartbeat 60 --net-ro-size 1000 --net-ro-interval 1 --net-http-port 0 --net-ri-port 0 --net-ro-port 30002 --net-sbs-port 30003 --net-bi-port 30004,30104 --net-bo-port 30005"
NET_OPTIONS="--net --net-heartbeat 60 --net-ro-size 1000 --net-ro-interval 1 --net-ri-port 0 --net-ro-port 30002 --net-sbs-port 30003 --net-bi-port 30004,30104 --net-bo-port 30005"
JSON_OPTIONS="--json-location-accuracy 1"

View file

@ -20,19 +20,20 @@ set -e
case "$1" in
remove)
echo "Disabling dump1090-fa lighttpd integration.." >&2
lighty-disable-mod dump1090-fa || echo "warning: failed to disable lighttpd module" >&2
invoke-rc.d lighttpd restart || echo "warning: failed to restart lighttpd" >&2
;;
purge)
rm -f /etc/default/dump1090-fa
rm -f /etc/cron.d/dump1090-fa
rm -rf /var/cache/dump1090-fa
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
remove)
if [ -e /etc/lighttpd/conf-enabled/89-dump1090.conf ]; then
echo "Disabling lighttpd integration.." >&2
lighty-disable-mod dump1090 || true
echo "Restarting lighttpd.." >&2
invoke-rc.d lighttpd restart || echo "Warning: lighttpd failed to restart." >&2
fi
;;
upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
*)