gumstix: Change defconfig

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

diff --git a/package/uhttpd/files/uhttpd.init b/package/uhttpd/files/uhttpd.init
index 4b747a0..d543dd8 100755 (executable)
--- a/package/uhttpd/files/uhttpd.init
+++ b/package/uhttpd/files/uhttpd.init
@@ -17,6 +17,17 @@ append_arg() {
        [ -n "$val" -o -n "$def" ] && append UHTTPD_ARGS "$opt ${val:-$def}"
 }
 
        [ -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"
 generate_keys() {
        local cfg="$1"
        local key="$2"


@@ -48,7 +59,7 @@ start_instance()
        UHTTPD_KEY=""
 
        local cfg="$1"
        UHTTPD_KEY=""
 
        local cfg="$1"

-       local realm="$(uci get system.@system[0].hostname 2>/dev/null)"
+       local realm="$(uci_get system.@system[0].hostname)"

        local listen http https
 
        append_arg "$cfg" home "-h"
        local listen http https
 
        append_arg "$cfg" home "-h"


@@ -58,6 +69,12 @@ start_instance()
        append_arg "$cfg" lua_prefix "-l"
        append_arg "$cfg" lua_handler "-L"
        append_arg "$cfg" script_timeout "-t"
        append_arg "$cfg" lua_prefix "-l"
        append_arg "$cfg" lua_handler "-L"
        append_arg "$cfg" script_timeout "-t"

+       append_arg "$cfg" network_timeout "-T"
+       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

 
        config_get http "$cfg" listen_http
        for listen in $http; do
 
        config_get http "$cfg" listen_http
        for listen in $http; do