X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/56d71638dbf48b8e4885e1e5ed5d0f1859674541..271da7f4e93492f377c0fcf25def4591d60b9fbc:/package/uhttpd/files/uhttpd.init diff --git a/package/uhttpd/files/uhttpd.init b/package/uhttpd/files/uhttpd.init index a25bf789c..069e16fff 100755 --- a/package/uhttpd/files/uhttpd.init +++ b/package/uhttpd/files/uhttpd.init @@ -6,14 +6,6 @@ UHTTPD_BIN="/usr/sbin/uhttpd" PX5G_BIN="/usr/sbin/px5g" -append_listen_http() { - append UHTTPD_ARGS "-p $1" -} - -append_listen_https() { - append UHTTPD_ARGS "-s $1" -} - append_arg() { local cfg="$1" local var="$2" @@ -25,6 +17,17 @@ append_arg() { [ -n "$val" -o -n "$def" ] && append UHTTPD_ARGS "$opt ${val:-$def}" } +append_bool() { + local cfg="$1" + local var="$2" + local opt="$3" + local def="$4" + local val + + config_get_bool val "$cfg" "$var" "$def" + [ "$val" = 1 ] && append UHTTPD_ARGS "$opt" +} + generate_keys() { local cfg="$1" local key="$2" @@ -42,11 +45,7 @@ generate_keys() { $PX5G_BIN selfsigned -der \ -days ${days:-730} -newkey rsa:${bits:-1024} -keyout "$UHTTPD_KEY" -out "$UHTTPD_CERT" \ -subj /C=${country:-DE}/ST=${state:-Saxony}/L=${location:-Leipzig}/CN=${commonname:-OpenWrt} - } || { - echo "WARNING: the specified certificate and key" \ - "files do not exist and the px5g generator" \ - "is not available, skipping SSL setup." - } + } } start_instance() @@ -56,8 +55,8 @@ start_instance() UHTTPD_KEY="" local cfg="$1" - local realm="$(uci get system.@system[0].hostname 2>/dev/null)" - local ssl + local realm="$(uci_get system.@system[0].hostname)" + local listen http https interpreter path append_arg "$cfg" home "-h" append_arg "$cfg" realm "-r" "${realm:-OpenWrt}" @@ -65,15 +64,31 @@ start_instance() append_arg "$cfg" cgi_prefix "-x" append_arg "$cfg" lua_prefix "-l" append_arg "$cfg" lua_handler "-L" - - config_list_foreach "$cfg" listen_http \ - append_listen_http - - config_get ssl "$cfg" listen_https + append_arg "$cfg" script_timeout "-t" + append_arg "$cfg" network_timeout "-T" + append_arg "$cfg" tcp_keepalive "-A" + append_arg "$cfg" error_page "-E" + append_arg "$cfg" index_page "-I" + + append_bool "$cfg" no_symlinks "-S" 0 + append_bool "$cfg" no_dirlists "-D" 0 + append_bool "$cfg" rfc1918_filter "-R" 0 + + config_get http "$cfg" listen_http + for listen in $http; do + append UHTTPD_ARGS "-p $listen" + done + + config_get interpreter "$cfg" interpreter + for path in $interpreter; do + append UHTTPD_ARGS "-i $path" + done + + config_get https "$cfg" listen_https config_get UHTTPD_KEY "$cfg" key /etc/uhttpd.key config_get UHTTPD_CERT "$cfg" cert /etc/uhttpd.crt - [ -n "$ssl" ] && { + [ -n "$https" ] && { [ -f "$UHTTPD_CERT" -a -f "$UHTTPD_KEY" ] || { config_foreach generate_keys cert } @@ -82,8 +97,9 @@ start_instance() append_arg "$cfg" cert "-C" append_arg "$cfg" key "-K" - config_list_foreach "$cfg" listen_https \ - append_listen_https + for listen in $https; do + append UHTTPD_ARGS "-s $listen" + done } }