Changeset 5896

Timestamp:

03/21/10 03:35:28 (3 years ago)

Author:

jow

Message:

uhttpd: complete init script and sample configuration

Location:

luci/trunk/contrib/package/uhttpd/files

Files:

• uhttpd.config (modified) (2 diffs)
• uhttpd.init (modified) (2 diffs)

luci/trunk/contrib/package/uhttpd/files/uhttpd.config

@@ -11 +11 @@
     # 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.
@@ -26 +26 @@
 #   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

luci/trunk/contrib/package/uhttpd/files/uhttpd.init

@@ -19 +19 @@
     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}"
 }
 
@@ -30 +31 @@
 
     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"