From ebfa6f63be3e0cbf2a519a226329241dc723ded3 Mon Sep 17 00:00:00 2001
From: Oliver Jowett <oliver@mutability.co.uk>
Date: Sun, 10 Jul 2016 11:58:46 +0100
Subject: [PATCH] Strip out the config options for the internal webserver.

---
 debian/config-template               |  8 --------
 debian/dump1090-mutability.config    |  2 --
 debian/dump1090-mutability.init      |  3 +--
 debian/dump1090-mutability.postinst  |  1 -
 debian/dump1090-mutability.templates | 11 -----------
 5 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/debian/config-template b/debian/config-template
index ead9469..7d138a8 100644
--- a/debian/config-template
+++ b/debian/config-template
@@ -51,14 +51,6 @@ MAX_RANGE=
 # Networking options
 #
 
-# Port to listen on for HTTP connections. 0 disables.
-# HTTP defaults to being disabled unless you specify something here. I 
-# that you do not enable this, and instead serve the contents of
-# /usr/share/dump1090-mutability and JSON_DIR (below) using a proper
-# webserver. See /etc/lighttpd/conf-available/90-dump1090.conf
-# for an example configuration ("sudo lighty-enable-mod dump1090" to enable)
-HTTP_PORT=
-
 # Port to listen on for raw (AVR-format) input connections. 0 disables.
 RAW_INPUT_PORT=
 
diff --git a/debian/dump1090-mutability.config b/debian/dump1090-mutability.config
index 435be45..08fec89 100644
--- a/debian/dump1090-mutability.config
+++ b/debian/dump1090-mutability.config
@@ -29,7 +29,6 @@ if [ -e $CONFIGFILE ]; then
   db_set $NAME/decode-lon "$LON"
   db_set $NAME/decode-max-range "$MAX_RANGE"
 
-  db_set $NAME/net-http-port "$HTTP_PORT"
   db_set $NAME/net-ri-port "$RAW_INPUT_PORT"
   db_set $NAME/net-ro-port "$RAW_OUTPUT_PORT"
   db_set $NAME/net-bi-port "$BEAST_INPUT_PORT"
@@ -209,7 +208,6 @@ db_go || true; db_get $NAME/auto-start; if [ "$RET" = "true" ]; then
   db_input_verify medium $NAME/decode-lon is_number_or_empty || true
  fi
 
- db_input_verify medium $NAME/net-http-port is_port_list || true
  db_input_verify low $NAME/net-ri-port is_port_list || true
  db_input_verify low $NAME/net-ro-port is_port_list || true
  db_input_verify low $NAME/net-bi-port is_port_list || true
diff --git a/debian/dump1090-mutability.init b/debian/dump1090-mutability.init
index 33f3934..1bb4adb 100644
--- a/debian/dump1090-mutability.init
+++ b/debian/dump1090-mutability.init
@@ -33,7 +33,6 @@ SCRIPTNAME=/etc/init.d/$NAME
 # sanitize missing settings
 [ -z "$START_DUMP1090" ] && START_DUMP1090=no
 [ -z "$DUMP1090_USER" ] && DUMP1090_USER="missing-DUMP1090_USER-setting-in-config"
-[ -z "$HTTP_PORT" ] && HTTP_PORT=0
 [ -z "$RAW_INPUT_PORT" ] && RAW_INPUT_PORT=0
 [ -z "$RAW_OUTPUT_PORT" ] && RAW_OUTPUT_PORT=0
 [ -z "$SBS_OUTPUT_PORT" ] && SBS_OUTPUT_PORT=0
@@ -65,7 +64,7 @@ ARGS="$ARGS --max-range $MAX_RANGE"
 
 # net:
 
-ARGS="$ARGS --net-http-port $HTTP_PORT \
+ARGS="$ARGS \
 --net-ri-port $RAW_INPUT_PORT --net-ro-port $RAW_OUTPUT_PORT \
 --net-bi-port $BEAST_INPUT_PORT --net-bo-port $BEAST_OUTPUT_PORT \
 --net-sbs-port $SBS_OUTPUT_PORT"
diff --git a/debian/dump1090-mutability.postinst b/debian/dump1090-mutability.postinst
index 189f603..244679f 100644
--- a/debian/dump1090-mutability.postinst
+++ b/debian/dump1090-mutability.postinst
@@ -79,7 +79,6 @@ case "$1" in
         subvar decode-lat LAT
         subvar decode-lon LON
         subvar decode-max-range MAX_RANGE
-        subvar net-http-port HTTP_PORT
         subvar net-ri-port RAW_INPUT_PORT
         subvar net-ro-port RAW_OUTPUT_PORT
         subvar net-bi-port BEAST_INPUT_PORT
diff --git a/debian/dump1090-mutability.templates b/debian/dump1090-mutability.templates
index bb59662..19762d2 100644
--- a/debian/dump1090-mutability.templates
+++ b/debian/dump1090-mutability.templates
@@ -94,17 +94,6 @@ Description: Absolute maximum range of receiver, in nautical miles:
 Type: string
 Default: 300
 
-Template: dump1090-mutability/net-http-port
-Description: Port for internal webserver (0 disables):
- dump1090 can provide an internal webserver that serves a basic "virtual
- radar" map.
- .
- It is generally a better idea to use an external webserver, but if you
- really want to use the internal one, you can select a port to listen
- on here.
-Type: string
-Default: 0
-
 Template: dump1090-mutability/net-ri-port
 Description: Portsfor AVR-format input connections (0 disables):
  dump1090 can accept connections to receive data from other sources in