projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: add md5sum of kernel
[openwrt.git]
/
package
/
uhttpd
/
files
/
uhttpd.init
diff --git
a/package/uhttpd/files/uhttpd.init
b/package/uhttpd/files/uhttpd.init
index
b00b2e2
..
069e16f
100755
(executable)
--- a/
package/uhttpd/files/uhttpd.init
+++ b/
package/uhttpd/files/uhttpd.init
@@
-45,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}
$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()
}
start_instance()
@@
-60,7
+56,7
@@
start_instance()
local cfg="$1"
local realm="$(uci_get system.@system[0].hostname)"
local cfg="$1"
local realm="$(uci_get system.@system[0].hostname)"
- local listen http https
+ local listen http https
interpreter path
append_arg "$cfg" home "-h"
append_arg "$cfg" realm "-r" "${realm:-OpenWrt}"
append_arg "$cfg" home "-h"
append_arg "$cfg" realm "-r" "${realm:-OpenWrt}"
@@
-70,6
+66,7
@@
start_instance()
append_arg "$cfg" lua_handler "-L"
append_arg "$cfg" script_timeout "-t"
append_arg "$cfg" network_timeout "-T"
append_arg "$cfg" lua_handler "-L"
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_arg "$cfg" error_page "-E"
append_arg "$cfg" index_page "-I"
@@
-82,6
+79,11
@@
start_instance()
append UHTTPD_ARGS "-p $listen"
done
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
config_get https "$cfg" listen_https
config_get UHTTPD_KEY "$cfg" key /etc/uhttpd.key
config_get UHTTPD_CERT "$cfg" cert /etc/uhttpd.crt
This page took
0.033989 seconds
and
4
git commands to generate.