uhttpd: complete init script and sample configuration

diff --git a/contrib/package/uhttpd/files/uhttpd.config b/contrib/package/uhttpd/files/uhttpd.config
index 97a43f4c0115995d49ceeb01140e3e3dbeb63ba5..9c4cd305b3df54e58b02438e66dfe14d5972b358 100644 (file)
--- a/contrib/package/uhttpd/files/uhttpd.config
+++ b/contrib/package/uhttpd/files/uhttpd.config
@@ -10,7 +10,7 @@ config uhttpd main
 
        # CGI url prefix, will be searched in docroot.
        # Default is /cgi-bin
-       option cgi_prefix       /cgi-bin
+       option cgi_prefix       /cgi-bin
 
        # Lua url prefix and handler script.
        # Lua support is disabled if no prefix given.
@@ -25,3 +25,8 @@ config uhttpd main
        list listen_https       0.0.0.0:443
 #      list listen_https       [::]:443
 
+       # Basic auth realm, defaults to local hostname
+#      option realm    OpenWrt
+
+       # Configuration file in busybox httpd format
+#      option config   /etc/httpd.conf

diff --git a/contrib/package/uhttpd/files/uhttpd.init b/contrib/package/uhttpd/files/uhttpd.init
index 08c6a39297e773e8fa6b44ee210038490013743c..b13cd60f3d246d9d724dac3cd48f57e9725147c6 100755 (executable)
--- a/contrib/package/uhttpd/files/uhttpd.init
+++ b/contrib/package/uhttpd/files/uhttpd.init
@@ -18,10 +18,11 @@ append_arg() {
        local cfg="$1"
        local var="$2"
        local opt="$3"
+       local def="$4"
        local val
 
        config_get val "$cfg" "$var"
-       [ -n "$val" ] && append UHTTPD_ARGS "$opt $val"
+       [ -n "$val" -o -n "$def" ] && append UHTTPD_ARGS "$opt ${val:-$def}"
 }
 
 start_instance()
@@ -29,10 +30,13 @@ start_instance()
        UHTTPD_ARGS=""
 
        local cfg="$1"
+       local realm="$(uci get system.@system[0].hostname 2>/dev/null)"
        local ssl
 
        append_arg "$cfg" home "-h"
-       append_arg "$cfg" cgi_prefix "-c"
+       append_arg "$cfg" realm "-r" "${realm:-OpenWrt}"
+       append_arg "$cfg" config "-c"
+       append_arg "$cfg" cgi_prefix "-x"
        append_arg "$cfg" lua_prefix "-l"
        append_arg "$cfg" lua_handler "-L"