aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-11 23:35:07 +0000
committerGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-11 23:35:07 +0000
commit6452ee886f06b5b48e887bcec28e303563e83e14 (patch)
treedd0d9ed3c943f3c68a43517b561bcda505d94d48
parent2b747e3a147d6b36fb3b73e103a2b954f5eaa8e9 (diff)
downloadbuildroot-6452ee886f06b5b48e887bcec28e303563e83e14.tar.gz
buildroot-6452ee886f06b5b48e887bcec28e303563e83e14.tar.bz2
Use a valid script file for lighttpd in target
-rw-r--r--package/lighttpd/lighttpd.mk4
-rw-r--r--package/lighttpd/rc.lighttpd39
2 files changed, 41 insertions, 2 deletions
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 8826aa6194..42fe190e16 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -3,7 +3,7 @@
# lighttpd
#
#############################################################
-LIGHTTPD_VERSION:=1.4.15
+LIGHTTPD_VERSION:=1.4.16
LIGHTTPD_SOURCE:=lighttpd_$(LIGHTTPD_VERSION).orig.tar.gz
LIGHTTPD_PATCH:=lighttpd_$(LIGHTTPD_VERSION)-1.diff.gz
LIGHTTPD_SITE:=http://ftp.debian.org/debian/pool/main/l/lighttpd
@@ -73,7 +73,7 @@ $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY): $(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY)
@if [ ! -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf ] ; then \
$(INSTALL) -m 0644 -D $(LIGHTTPD_DIR)/doc/lighttpd.conf $(TARGET_DIR)/etc/lighttpd/lighttpd.conf; \
fi;
- $(INSTALL) -m 0755 -D $(LIGHTTPD_DIR)/openwrt/S51lighttpd $(TARGET_DIR)/etc/init.d/S99lighttpd
+ $(INSTALL) -m 0755 -D package/lighttpd/rc.lighttpd $(TARGET_DIR)/etc/init.d/S99lighttpd
ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_OPENSSL)),y)
lighttpd: uclibc openssl $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY)
diff --git a/package/lighttpd/rc.lighttpd b/package/lighttpd/rc.lighttpd
new file mode 100644
index 0000000000..837e074e8b
--- /dev/null
+++ b/package/lighttpd/rc.lighttpd
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# Starts lighttpd
+#
+
+umask 077
+
+start() {
+ echo -n "Starting lighttpd: "
+ start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/lighttpd.pid -b --exec /usr/sbin/lighttpd -- -f /etc/lighttpd/lighttpd.conf -D
+ echo "OK"
+}
+stop() {
+ echo -n "Stopping lighttpd: "
+ start-stop-daemon --stop --quiet --pidfile /var/run/lighttpd.pid
+ echo "OK"
+}
+restart() {
+ stop
+ start
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|reload)
+ restart
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart}"
+ exit 1
+esac
+
+exit $?
+