X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e417063c23716f0dd35f98f1990bb8dad7b963f4..02f4867a492aa007738b3c298c9a73a42776ef7a:/package/uhttpd/files/uhttpd.init

diff --git a/package/uhttpd/files/uhttpd.init b/package/uhttpd/files/uhttpd.init
index d543dd84b..c370f9010 100755
--- a/package/uhttpd/files/uhttpd.init
+++ b/package/uhttpd/files/uhttpd.init
@@ -2,10 +2,13 @@
 # Copyright (C) 2010 Jo-Philipp Wich
 
 START=50
+
+SERVICE_DAEMONIZE=1
+SERVICE_WRITE_PID=1
+
 UHTTPD_BIN="/usr/sbin/uhttpd"
 PX5G_BIN="/usr/sbin/px5g"
 
-
 append_arg() {
 	local cfg="$1"
 	local var="$2"
@@ -44,12 +47,8 @@ generate_keys() {
 	[ -x "$PX5G_BIN" ] && {
 		$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."
-	}	
+			-subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/CN="${commonname:-OpenWrt}"
+	}
 }
 
 start_instance()
@@ -60,7 +59,7 @@ start_instance()
 
 	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}"
@@ -70,17 +69,24 @@ start_instance()
 	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_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
@@ -100,21 +106,16 @@ start_instance()
 		}
 	}
 
-	start-stop-daemon -S -x $UHTTPD_BIN \
-		-p /var/run/uhttpd_${cfg}.pid \
-		-m -b -- -f $UHTTPD_ARGS
+	SERVICE_PID_FILE=/var/run/uhttpd_${cfg}.pid
+	service_start $UHTTPD_BIN -f $UHTTPD_ARGS
 }
 
 stop_instance()
 {
 	local cfg="$1"
 
-	[ -f /var/run/uhttpd_${cfg}.pid ] && {
-		start-stop-daemon -K -q -n ${UHTTPD_BIN##*/} \
-			-p /var/run/uhttpd_${cfg}.pid -s TERM
-
-		rm -f /var/run/uhttpd_${cfg}.pid
-	}
+	SERVICE_PID_FILE=/var/run/uhttpd_${cfg}.pid
+	service_stop $UHTTPD_BIN
 }
 
 start() {