Have separate map url for new merged SkyAware. Set default port 8080 to this map

debian/dump1090-fa.install

@@ -1,4 +1,5 @@
 public_html/* usr/share/dump1090-fa/html
+public_html_merged/* usr/share/skyaware/html
 debian/lighttpd/* etc/lighttpd/conf-available
 bladerf/* usr/share/dump1090-fa/bladerf
 debian/start-dump1090-fa usr/share/dump1090-fa/

debian/lighttpd/89-dump1090-fa.conf

@@ -21,27 +21,15 @@
 # server.modules += ( "mod_alias" )
 
 alias.url += (
-  "/skyaware/data/" => "/run/dump1090-fa/",
+  "/dump1090-fa/data/" => "/run/dump1090-fa/",
-  "/skyaware/data-978/" => "/run/skyaware978/",
+  "/dump1090-fa/" => "/usr/share/dump1090-fa/html/"
-  "/skyaware/" => "/usr/share/dump1090-fa/html/"
 )
 
 # redirect the slash-less URL
 url.redirect += (
-  "^/skyaware$" => "/skyaware/",
+  "^/dump1090-fa$" => "/dump1090-fa/"
-  "^/dump1090-fa$" => "/skyaware/",
-  "^/dump1090-fa/" => "/skyaware/"
 )
 
-# Listen on port 8080 and serve the map there, too.
-$SERVER["socket"] == ":8080" {
-  alias.url += (
-    "/data/" => "/run/dump1090-fa/",
-    "/data-978/" => "/run/skyaware978/",
-    "/" => "/usr/share/dump1090-fa/html/"
-  )
-}
-
 # Add CORS header
 server.modules += ( "mod_setenv" )
 $HTTP["url"] =~ "^/dump1090-fa/data/.*\.json$" {
@@ -60,8 +48,8 @@ $HTTP["url"] =~ "^/dump1090-fa/data/.*\.json$" {
 #    ssl.honor-cipher-order = "enable"
 #    ssl.cipher-list = "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH"
 #    ssl.use-sslv2 = "disable"
-#    ssl.use-sslv3 = "disable"       
+#    ssl.use-sslv3 = "disable"
-#    
+#
 #  alias.url += (
 #    "/data/" => "/run/dump1090-fa/",
 #    "/" => "/usr/share/dump1090-fa/html/"
@@ -75,4 +63,3 @@ $HTTP["url"] =~ "^/dump1090-fa/data/.*\.json$" {
 #    url.redirect = (".*" => "https://%0$0")
 #  }
 #}
-

debian/lighttpd/89-skyaware.conf

@@ -0,0 +1,75 @@
+# Allows access to the static files that provide the dump1090 map view,
+# and also to the dynamically-generated json parts that contain aircraft
+# data and are periodically written by the dump1090 daemon.
+
+# Enable alias module
+#
+## This module is normally already enabled in lighttpd, so you should not
+## need to uncommment this line.
+## There are some cases (e.g. when installing this on a Raspberry Pi
+## that runs PiHole) in which the module has been removed from the
+## default configuration, and the dump1090-fa web interface no longer
+## loads properly.
+## If this is what you are experiencing, or if you see messages in your
+## error log like:
+## (server.c.1493) WARNING: unknown config-key: alias.url (ignored)
+## then uncommenting this line and then restarting lighttpd could fix
+## the issue.
+## This is not enabled by default as standard lighttpd will not start if
+## modules are loaded multiple times.
+#
+# server.modules += ( "mod_alias" )
+
+alias.url += (
+  "/skyaware/data/" => "/run/dump1090-fa/",
+  "/skyaware/data-978/" => "/run/skyaware978/",
+  "/skyaware/" => "/usr/share/skyaware/html/"
+)
+
+# redirect the slash-less URL
+url.redirect += (
+  "^/skyaware$" => "/skyaware/"
+)
+
+# Listen on port 8080 and serve the map there, too.
+$SERVER["socket"] == ":8080" {
+  alias.url += (
+    "/data/" => "/run/dump1090-fa/",
+    "/data-978/" => "/run/skyaware978/",
+    "/" => "/usr/share/skyaware/html/"
+  )
+}
+
+# Add CORS header
+server.modules += ( "mod_setenv" )
+$HTTP["url"] =~ "^/skyaware/data/.*\.json$" {
+  setenv.set-response-header = ( "Access-Control-Allow-Origin" => "*" )
+}
+
+# Uncomment this section to enable SSL traffic (HTTPS) - especially useful
+# for .dev domains
+## Listen on 8443 for SSL connections
+#server.modules += ( "mod_openssl" )
+#$HTTP["host"] == "piaware.example.com" {
+#  $SERVER["socket"] == ":8443" {
+#    ssl.engine = "enable"
+#    ssl.pemfile = "/etc/ssl/certs/combined.pem"
+#    ssl.ca-file =  "/etc/ssl/certs/fullchain.cer"
+#    ssl.honor-cipher-order = "enable"
+#    ssl.cipher-list = "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH"
+#    ssl.use-sslv2 = "disable"
+#    ssl.use-sslv3 = "disable"
+#
+#  alias.url += (
+#    "/data/" => "/run/dump1090-fa/",
+#    "/" => "/usr/share/dump1090-fa/html/"
+#  )
+#  }
+#}
+#
+## Redirect HTTP to HTTPS
+#$HTTP["scheme"] == "http" {
+#  $HTTP["host"] =~ ".*" {
+#    url.redirect = (".*" => "https://%0$0")
+#  }
+#}

public_html/README.md

@@ -6,13 +6,13 @@ Syntax: <ip_address>/dump1090-fa/?parameter=value
 
 Examples:
 
-    http://<ip_address>/dump1090-fa/?sidebar=hide
+    http://192.0.0.1/dump1090-fa/?sidebar=hide
 
-    http://<ip_address>/dump1090-fa/?altitudeChart=hide
+    http://192.0.0.1/dump1090-fa/?altitudeChart=hide
 
-    http://<ip_address>/dump1090-fa/?rangeRings=hide
+    http://192.0.0.1/dump1090-fa/?rangeRings=hide
 
-    http://<ip_address>/dump1090-fa/?ringCount=3&ringBaseDistance=100&ringInterval=50
+    http://192.0.0.1/dump1090-fa/?ringCount=3?ringBaseDistance=100?ringInterval=50
 
 | Parameter | Possible Values |
 | :---------: | :---------: |
@@ -31,7 +31,7 @@ Examples:
 | rangeRings | show/hide | 
 | ringCount | integer |
 | ringBaseDistance | integer |
-| ringInterval | integer |
+| ringInteval | integer | 
 
 
 

public_html/config.js

@@ -125,8 +125,3 @@ BingMapsAPIKey = null;
 // This is not polished yet (and so is disabled by default),
 // currently it's just a data dump of the new fields with no UX work.
 ExtendedData = false;
-
-DefaultMaxAltitudeFilter = 65000
-DefaultMinAltitudeFilter = 0
-DefaultMaxSpeedFilter = 1000
-DefaultMinSpeedFilter = 0

public_html/db/2.json

@@ -1 +1 @@
-{"01001":{"r":"V5-NAM","t":"F900"},"01028":{"r":"V5-NMF","t":"A343"},"01029":{"r":"V5-NME","t":"A343"},"0103F":{"r":"V5-GON"},"02031":{"r":"E3-AAQ","t":"B762"}}
+{"01001":{"r":"V5-NAM","t":"F900"},"01028":{"r":"V5-NMF","t":"A343"},"01029":{"r":"V5-NME","t":"A343"},"02031":{"r":"E3-AAQ","t":"B762"}}

public_html/db/6.json

@@ -1 +1 @@
-{"00007":{"r":"EK-32011","t":"A319"},"0000B":{"r":"EK-32003","t":"A320"},"0000C":{"r":"EK-32008","t":"A320"},"00010":{"r":"EK-73736","t":"B735"},"00013":{"r":"EK-11001","t":"AN12"},"00023":{"r":"EK-73786","t":"B737"},"0002F":{"r":"EK-12104","t":"AN12"},"0003C":{"r":"EK-RA01","t":"A319"},"0004A":{"r":"EK-32007","t":"A319"},"00053":{"r":"EK-FAB","t":"B734"},"00059":{"r":"EK-95015","t":"SU95"},"0005A":{"r":"EK-95016","t":"SU95"},"0005F":{"r":"EW-412TH","t":"IL76"},"00076":{"r":"EK-74723","t":"B742"},"00079":{"r":"EK-74798","t":"B742"},"00087":{"r":"EK-74799","t":"B742"},"0009D":{"r":"EK-73775","t":"B735"},"0009F":{"r":"EK-73772","t":"B735"},"000A2":{"r":"EK-SHA","t":"B735"},"00801":{"r":"4K8888","t":"A319"},"00803":{"r":"4KAZ03","t":"A319"},"00804":{"r":"4KAZ04","t":"A319"},"00805":{"r":"4KAZ05","t":"A319"},"00806":{"r":"4KAI06","t":"GLF5"},"00807":{"r":"4KAI07","t":"A320"},"00808":{"r":"4K-MEK8","t":"GLF5"},"0080C":{"r":"4KAZ12","t":"B752"},"00826":{"r":"4K-AZ38","t":"B752"},"00828":{"r":"4KAZ40","t":"IL76"},"00829":{"r":"4KAZ41","t":"IL76"},"0082B":{"r":"4K-AZ43","t":"B752"},"00836":{"r":"4K-AZ54","t":"A320"},"00838":{"r":"4K-AZ56","t":"AN12"},"0083C":{"r":"4KAZ60","t":"IL76"},"00840":{"r":"4KAZ64","t":"E190"},"00841":{"r":"4KAZ65","t":"E190"},"00842":{"r":"4KAZ66","t":"E190"},"00843":{"r":"4KAZ67","t":"E190"},"0084D":{"r":"4KAZ77","t":"A320"},"0084E":{"r":"4KAZ78","t":"A320"},"0084F":{"r":"4KAZ79","t":"A320"},"00850":{"r":"4KAZ80","t":"A320"},"00851":{"r":"4KAZ81","t":"B763"},"00852":{"r":"4KAZ82","t":"B763"},"00853":{"r":"4KAZ83","t":"A320"},"00854":{"r":"4KAZ84","t":"A320"},"00855":{"r":"4KAZ85","t":"A345"},"00856":{"r":"4KAZ86","t":"A345"},"00858":{"r":"4KAZ88","t":"GALX"},"00864":{"r":"4KAZ100","t":"IL76"},"00865":{"r":"4KAZ101","t":"IL76"},"008D0":{"r":"4K-AZ208","t":"G280"},"00918":{"r":"4K-AZ280","t":"G280"},"00B20":{"r":"4KSW800","t":"B744"},"00B21":{"r":"4KSW888","t":"B744"},"00B70":{"r":"4K-SW880","t":"B763"},"00B78":{"r":"4KAZ888","t":"GLF4"},"00BB9":{"r":"4K-SW808","t":"B763"},"00BBE":{"r":"4KSW008","t":"B744"},"00BBF":{"r":"4KAZ11","t":"B752"},"00BC0":{"r":"4KAI08","t":"A346"},"00BC4":{"r":"4KAI88","t":"GLF6"},"00BC6":{"r":"4K-LAR","t":"GLF4"},"00BC7":{"r":"4KJJ888","t":"GLF5"},"00BE8":{"r":"4KAI01","t":"B763"},"00BE9":{"r":"4KAI001","t":"B77L"},"01097":{"r":"EX-37008"},"010F2":{"r":"EX-32001","t":"A320"},"010F4":{"r":"EX-37001","t":"B733"},"010F9":{"r":"EX-73401","t":"B734"},"01839":{"r":"EZ-A779","t":"B77L"},"0183A":{"r":"EZ-A778","t":"B77L"},"0183B":{"r":"EZ-A017","t":"B738"},"0183C":{"r":"EZ-A016","t":"B738"},"0183D":{"r":"EZ-A015","t":"B738"},"01842":{"r":"EZ-A010","t":"B752"},"01846":{"r":"EZ-A011","t":"B752"},"01847":{"r":"EZ-A012","t":"B752"},"01849":{"r":"EZ-A014","t":"B752"},"01854":{"r":"EZ-A106","t":"B712"},"01855":{"r":"EZ-A107","t":"B712"},"01858":{"r":"EZ-A004","t":"B738"},"01859":{"r":"EZ-A005","t":"B738"},"0185A":{"r":"EZ-A007","t":"B737"},"0185E":{"r":"EZ-A006","t":"B737"},"0185F":{"r":"EZ-A008","t":"B737"},"01860":{"r":"EZ-A009","t":"B737"},"01861":{"r":"EZ-A777","t":"B772"},"80001":{"r":"A5-RGF","t":"A319"},"80002":{"r":"A5-RGG","t":"A319"},"82209":{"r":"JU-1011","t":"B763"},"8220A":{"r":"JU-1012","t":"B763"},"83037":{"r":"UP-B5701","t":"B752"},"83065":{"r":"UP-Y4204","t":"YK42"},"83088":{"r":"UP-I7620","t":"IL76"},"830A5":{"r":"UP-A2001","t":"A320"},"830BD":{"r":"UP-CS302","t":"C25B"},"830C2":{"r":"UP-K3501","t":"B350"},"830ED":{"r":"UP-A3001","t":"A332"},"830FE":{"r":"UP-K3502","t":"B350"},"831E8":{"r":"UP-T5409","t":"T154"}}
+{"00007":{"r":"EK-32011","t":"A319"},"0000A":{"r":"EK-32002","t":"A320"},"0000B":{"r":"EK-32003","t":"A320"},"0000C":{"r":"EK-32008","t":"A320"},"00010":{"r":"EK-73736","t":"B735"},"00013":{"r":"EK-11001","t":"AN12"},"00023":{"r":"EK-73786","t":"B737"},"0002F":{"r":"EK-12104","t":"AN12"},"0003C":{"r":"EK-RA01","t":"A319"},"0004A":{"r":"EK-32007","t":"A319"},"00059":{"r":"EK-95015","t":"SU95"},"0005A":{"r":"EK-95016","t":"SU95"},"0005F":{"r":"EW-412TH","t":"IL76"},"00076":{"r":"EK-74723","t":"B742"},"00079":{"r":"EK-74798","t":"B742"},"00087":{"r":"EK-74799","t":"B742"},"0009D":{"r":"EK-73775","t":"B735"},"0009F":{"r":"EK-73772","t":"B735"},"00801":{"r":"4K8888","t":"A319"},"00803":{"r":"4KAZ03","t":"A319"},"00804":{"r":"4KAZ04","t":"A319"},"00805":{"r":"4KAZ05","t":"A319"},"00806":{"r":"4KAI06","t":"GLF5"},"00807":{"r":"4KAI07","t":"A320"},"00808":{"r":"4K-MEK8","t":"GLF5"},"0080C":{"r":"4KAZ12","t":"B752"},"00826":{"r":"4K-AZ38","t":"B752"},"00828":{"r":"4KAZ40","t":"IL76"},"00829":{"r":"4KAZ41","t":"IL76"},"0082B":{"r":"4K-AZ43","t":"B752"},"00836":{"r":"4K-AZ54","t":"A320"},"00838":{"r":"4K-AZ56","t":"AN12"},"0083C":{"r":"4KAZ60","t":"IL76"},"00840":{"r":"4KAZ64","t":"E190"},"00841":{"r":"4KAZ65","t":"E190"},"00842":{"r":"4KAZ66","t":"E190"},"00843":{"r":"4KAZ67","t":"E190"},"0084D":{"r":"4KAZ77","t":"A320"},"0084E":{"r":"4KAZ78","t":"A320"},"0084F":{"r":"4KAZ79","t":"A320"},"00850":{"r":"4KAZ80","t":"A320"},"00851":{"r":"4KAZ81","t":"B763"},"00852":{"r":"4KAZ82","t":"B763"},"00853":{"r":"4KAZ83","t":"A320"},"00854":{"r":"4KAZ84","t":"A320"},"00855":{"r":"4KAZ85","t":"A345"},"00856":{"r":"4KAZ86","t":"A345"},"00858":{"r":"4KAZ88","t":"GALX"},"00864":{"r":"4KAZ100","t":"IL76"},"00865":{"r":"4KAZ101","t":"IL76"},"008D0":{"r":"4K-AZ208","t":"G280"},"00918":{"r":"4K-AZ280","t":"G280"},"00B20":{"r":"4KSW800","t":"B744"},"00B21":{"r":"4KSW888","t":"B744"},"00B70":{"r":"4K-SW880","t":"B763"},"00B78":{"r":"4KAZ888","t":"GLF4"},"00BB9":{"r":"4K-SW808","t":"B763"},"00BBE":{"r":"4KSW008","t":"B744"},"00BBF":{"r":"4KAZ11","t":"B752"},"00BC0":{"r":"4KAI08","t":"A346"},"00BC4":{"r":"4KAI88","t":"GLF6"},"00BC6":{"r":"4K-LAR","t":"GLF4"},"00BC7":{"r":"4KJJ888","t":"GLF5"},"00BE8":{"r":"4KAI01","t":"B763"},"00BE9":{"r":"4KAI001","t":"B77L"},"01097":{"r":"EX-37008"},"010F2":{"r":"EX-32001","t":"A320"},"010F4":{"r":"EX-37001","t":"B733"},"010F9":{"r":"EX-73401","t":"B734"},"01839":{"r":"EZ-A779","t":"B77L"},"0183A":{"r":"EZ-A778","t":"B77L"},"0183B":{"r":"EZ-A017","t":"B738"},"0183C":{"r":"EZ-A016","t":"B738"},"0183D":{"r":"EZ-A015","t":"B738"},"01842":{"r":"EZ-A010","t":"B752"},"01846":{"r":"EZ-A011","t":"B752"},"01847":{"r":"EZ-A012","t":"B752"},"01849":{"r":"EZ-A014","t":"B752"},"01854":{"r":"EZ-A106","t":"B712"},"01855":{"r":"EZ-A107","t":"B712"},"01858":{"r":"EZ-A004","t":"B738"},"01859":{"r":"EZ-A005","t":"B738"},"0185A":{"r":"EZ-A007","t":"B737"},"0185E":{"r":"EZ-A006","t":"B737"},"0185F":{"r":"EZ-A008","t":"B737"},"01860":{"r":"EZ-A009","t":"B737"},"01861":{"r":"EZ-A777","t":"B772"},"80001":{"r":"A5-RGF","t":"A319"},"80002":{"r":"A5-RGG","t":"A319"},"82209":{"r":"JU-1011","t":"B763"},"8220A":{"r":"JU-1012","t":"B763"},"83037":{"r":"UP-B5701","t":"B752"},"83065":{"r":"UP-Y4204","t":"YK42"},"83088":{"r":"UP-I7620","t":"IL76"},"830A5":{"r":"UP-A2001","t":"A320"},"830BD":{"r":"UP-CS302","t":"C25B"},"830C2":{"r":"UP-K3501","t":"B350"},"830ED":{"r":"UP-A3001","t":"A332"},"830FE":{"r":"UP-K3502","t":"B350"},"831E8":{"r":"UP-T5409","t":"T154"}}