uhttpd: update to latest git revision

[openwrt/openwrt.git] / package / network / services / uhttpd / files / uhttpd.init

diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
index ce304831ebd9d6391b2124846357a443629af2d1..fcde52a5640f6a037b49f50a25da01bcd050f561 100755 (executable)
--- a/package/network/services/uhttpd/files/uhttpd.init
+++ b/package/network/services/uhttpd/files/uhttpd.init
@@ -45,8 +45,11 @@ generate_keys() {
 
        [ -x "$PX5G_BIN" ] && {
                $PX5G_BIN selfsigned -der \
-                       -days ${days:-730} -newkey rsa:${bits:-1024} -keyout "$UHTTPD_KEY" -out "$UHTTPD_CERT" \
+                       -days ${days:-730} -newkey rsa:${bits:-1024} -keyout "${UHTTPD_KEY}.new" -out "${UHTTPD_CERT}.new" \
                        -subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/CN="${commonname:-OpenWrt}"
+               sync
+               mv "${UHTTPD_KEY}.new" "${UHTTPD_KEY}"
+               mv "${UHTTPD_CERT}.new" "${UHTTPD_CERT}"
        }
 }
 
@@ -57,19 +60,27 @@ start_instance()
 
        local cfg="$1"
        local realm="$(uci_get system.@system[0].hostname)"
-       local listen http https interpreter indexes path
+       local listen http https interpreter indexes path handler
 
        procd_open_instance
+       procd_set_param respawn
+       procd_set_param stderr 1
        procd_set_param command "$UHTTPD_BIN" -f
 
        append_arg "$cfg" home "-h"
        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"
-       append_arg "$cfg" ubus_prefix "-u"
-       append_arg "$cfg" ubus_socket "-U"
+       [ -f /usr/lib/uhttpd_lua.so ] && {
+               config_get handler "$cfg" lua_handler
+               [ -f "$handler" ] && append_arg "$cfg" lua_prefix "-l" && {
+                       procd_append_param command "-L" "$handler"
+               }
+       }
+       [ -f /usr/lib/uhttpd_ubus.so ] && {
+               append_arg "$cfg" ubus_prefix "-u"
+               append_arg "$cfg" ubus_socket "-U"
+       }
        append_arg "$cfg" script_timeout "-t"
        append_arg "$cfg" network_timeout "-T"
        append_arg "$cfg" http_keepalive "-k"
@@ -83,6 +94,11 @@ start_instance()
        append_bool "$cfg" no_dirlists "-D" 0
        append_bool "$cfg" rfc1918_filter "-R" 0
 
+       config_get alias_list "$cfg" alias
+       for alias in $alias_list; do
+                procd_append_param command -y "$alias"
+       done
+
        config_get http "$cfg" listen_http
        for listen in $http; do
                 procd_append_param command -p "$listen"
@@ -102,8 +118,8 @@ start_instance()
        config_get UHTTPD_KEY  "$cfg" key  /etc/uhttpd.key
        config_get UHTTPD_CERT "$cfg" cert /etc/uhttpd.crt
 
-       [ -n "$https" ] && {
-               [ -f "$UHTTPD_CERT" -a -f "$UHTTPD_KEY" ] || {
+       [ -f /lib/libustream-ssl.so ] && [ -n "$https" ] && {
+               [ -s "$UHTTPD_CERT" -a -s "$UHTTPD_KEY" ] || {
                        config_foreach generate_keys cert
                }
 
@@ -115,14 +131,11 @@ start_instance()
                                procd_append_param command -s "$listen"
                        done
                }
+
+               append_bool "$cfg" redirect_https "-q" 0
        }
 
        procd_close_instance
-
-       # Check if daemon is running, if not then
-       # re-execute in foreground to display error.
-#      sleep 1 && service_check $UHTTPD_BIN || \
-#              $UHTTPD_BIN -f $UHTTPD_ARGS
 }
 
 service_triggers()