diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-03-21 02:35:28 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-03-21 02:35:28 +0000 |
| commit | 23052d8f013188302dd9faee47f6911e4ed0e1e1 (patch) | |
| tree | 2c9170d9293039fa160e007b64fbc8b7e83493d7 /contrib/package/uhttpd/files | |
| parent | 79dde1ad3fd240ec084b4b9c160c95e6c82336ee (diff) | |
uhttpd: complete init script and sample configuration
Diffstat (limited to 'contrib/package/uhttpd/files')
| -rw-r--r-- | contrib/package/uhttpd/files/uhttpd.config | 7 | ||||
| -rwxr-xr-x | contrib/package/uhttpd/files/uhttpd.init | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/contrib/package/uhttpd/files/uhttpd.config b/contrib/package/uhttpd/files/uhttpd.config index 97a43f4c01..9c4cd305b3 100644 --- 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 08c6a39297..b13cd60f3d 100755 --- 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" |