Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

uhttpd: complete init script and sample configuration

Browse source
This commit is contained in:
Jo-Philipp Wich 2010-03-21 02:35:28 +00:00
parent 79dde1ad3f
commit 23052d8f01
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
contrib/package/uhttpd/files/uhttpd.config
View file

@ -10,7 +10,7 @@ config uhttpd main
# CGI url prefix, will be searched in docroot. # CGI url prefix, will be searched in docroot.
# Default is /cgi-bin # Default is /cgi-bin
option cgi_prefix /cgi-bin option cgi_prefix /cgi-bin
# Lua url prefix and handler script. # Lua url prefix and handler script.
# Lua support is disabled if no prefix given. # 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 0.0.0.0:443
# list listen_https [::]: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

8
contrib/package/uhttpd/files/uhttpd.init
View file

@ -18,10 +18,11 @@ append_arg() {
local cfg="$1" local cfg="$1"
local var="$2" local var="$2"
local opt="$3" local opt="$3"
local def="$4"
local val local val
config_get val "$cfg" "$var" 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() start_instance()
@ -29,10 +30,13 @@ start_instance()
UHTTPD_ARGS="" UHTTPD_ARGS=""
local cfg="$1" local cfg="$1"
local realm="$(uci get system.@system[0].hostname 2>/dev/null)"
local ssl local ssl
append_arg "$cfg" home "-h" 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_prefix "-l"
append_arg "$cfg" lua_handler "-L" append_arg "$cfg" lua_handler "-L"