split /www into subdirs for several services; adapt uhttpd config

This patch splits the single uhttpd instance into two uhttpd instances
with www root /www/<servicename> for the following purposes:
- service :: self-service / debugging / status.xml
- redirection :: use for splash/robinson redirection

The uhttpd uci config is adapted: by default all instances declared
there are disabled; They shall be enabled by the FSM inetable. To this
end a listen_http directive will be added and the config type will be
changed from 'disabled' to 'uhttpd' by state transition scripts.

11 files changed, 21 insertions, 12 deletions

diff --git a/files/common/etc/config/uhttpd b/files/common/etc/config/uhttpd
index 8320d42..857a7c1 100644
--- a/files/common/etc/config/uhttpd
+++ b/files/common/etc/config/uhttpd
@@ -1,12 +1,11 @@
-# Server configuration
-config uhttpd main
-
-	# HTTP listen addresses, multiple allowed
-	list listen_http	0.0.0.0:80
-	# Server document root
-	option home		/www
-	option error_page 	/cgi-bin/redirect
-	option index_page	cgi-bin/redirect
+# By default all instances declared here are disabled; They are
+# enabled by the FSM inetable. To this end a listen_http directive
+# will be added and the config type will be changed from 'disabled' to
+# 'uhttpd'; The rest of the config section is left as-is.
+
+# service instance
+config disabled service
+	option home		/www/service
 	# Reject requests from RFC1918 IP addresses
 	# directed to the servers public IP(s).
 	# This is a DNS rebinding countermeasure.
@@ -20,7 +19,7 @@ config uhttpd main
 	# write data within the given amount of seconds,
 	# the server will terminate the request with
 	# 504 Gateway Timeout response.
-	option script_timeout	60
+	option script_timeout	10
 
 	# Network timeout, if the current connection is
 	# blocked for the specified amount of seconds,
@@ -33,7 +32,17 @@ config uhttpd main
 	# The value is given in seconds to specify the
 	# interval between subsequent probes.
 	# Setting this to 0 will disable TCP keep-alive.
-	option tcp_keepalive	1
-
+	option tcp_keepalive	10
 
+# redirection instance
+config disabled redirection
+	option home		/www/redirection
+	option error_page 	/cgi-bin/redirect
+	option index_page	cgi-bin/redirect
 
+	# default options
+	option rfc1918_filter 1
+	option cgi_prefix	/cgi-bin
+	option script_timeout	10
+	option network_timeout	30
+	option tcp_keepalive	10
diff --git a/files/common/www/cgi-bin/debug b/files/common/www/service/cgi-bin/debug
index 14d8447..14d8447 100755
--- a/files/common/www/cgi-bin/debug
+++ b/files/common/www/service/cgi-bin/debug
diff --git a/files/common/www/cgi-bin/redirect b/files/common/www/service/cgi-bin/redirect
index 9b417db..9b417db 100755
--- a/files/common/www/cgi-bin/redirect
+++ b/files/common/www/service/cgi-bin/redirect
diff --git a/files/common/www/cgi-bin/splash b/files/common/www/service/cgi-bin/splash
index ee907d6..ee907d6 100755
--- a/files/common/www/cgi-bin/splash
+++ b/files/common/www/service/cgi-bin/splash
diff --git a/files/common/www/cgi-bin/splash_click b/files/common/www/service/cgi-bin/splash_click
index d08af6a..d08af6a 100755
--- a/files/common/www/cgi-bin/splash_click
+++ b/files/common/www/service/cgi-bin/splash_click
diff --git a/files/common/www/cgi-bin/status.xml b/files/common/www/service/cgi-bin/status.xml
index 8d45a90..8d45a90 100755
--- a/files/common/www/cgi-bin/status.xml
+++ b/files/common/www/service/cgi-bin/status.xml
diff --git a/files/common/www/cgi-bin/template.status.xml b/files/common/www/service/cgi-bin/template.status.xml
index 7df4e9f..7df4e9f 100644
--- a/files/common/www/cgi-bin/template.status.xml
+++ b/files/common/www/service/cgi-bin/template.status.xml
diff --git a/files/common/www/ff-jena_signet.png b/files/common/www/service/ff-jena_signet.png
index 15d216c..15d216c 100644
--- a/files/common/www/ff-jena_signet.png
+++ b/files/common/www/service/ff-jena_signet.png
diff --git a/files/common/www/ffj.css b/files/common/www/service/ffj.css
index 3542611..3542611 100644
--- a/files/common/www/ffj.css
+++ b/files/common/www/service/ffj.css
diff --git a/files/common/www/iframe.html b/files/common/www/service/iframe.html
index cdee514..cdee514 100644
--- a/files/common/www/iframe.html
+++ b/files/common/www/service/iframe.html
diff --git a/files/common/www/splash.html b/files/common/www/service/splash.html
index 7b85b5e..7b85b5e 100644
--- a/files/common/www/splash.html
+++ b/files/common/www/service/splash.html