2 files changed, 8 insertions, 12 deletions
diff --git a/network/lighttpd2/conf/angel.conf b/network/lighttpd2/conf/angel.conf
index 49d8890740fe..d02e674fe5dc 100644
--- a/network/lighttpd2/conf/angel.conf
+++ b/network/lighttpd2/conf/angel.conf
@@ -1,11 +1,6 @@
-instance {
-	user "lighttpd";
-	group "lighttpd";
+user "lighttpd";
+group "lighttpd";
 
-	max-open-files 16384;
+max_open_files 16384;
 
-	copy-env ( "PATH" );
-
-#	env ( "G_SLICE=always-malloc", "G_DEBUG=gc-friendly" );
-#	wrapper ("/usr/bin/valgrind", "--leak-check=full", "--show-reachable=yes", "--leak-resolution=high" );
-}
+copy_env ( "PATH" );
diff --git a/network/lighttpd2/conf/rc.lighttpd2 b/network/lighttpd2/conf/rc.lighttpd2
index e7a8ca286aff..635092e07107 100644
--- a/network/lighttpd2/conf/rc.lighttpd2
+++ b/network/lighttpd2/conf/rc.lighttpd2
@@ -28,7 +28,7 @@ PIDOF=$(pidof lighttpd2)
 
 lighttpd_start() {
   echo "Starting lighttpd2: $LIGHTTPD"
-  if [ $PIDOF ]; then
+  if [ "$PIDOF" ]; then
     echo "Already running!"
     return
   fi
@@ -39,8 +39,9 @@ lighttpd_start() {
 
 lighttpd_stop() {
   echo "Stopping lighttpd2: $LIGHTTPD"
-  if [ $PIDOF ]; then
+  if [ "$PIDOF" ]; then
     kill $PIDOF
+    sleep 2
     rm /var/run/lighttpd2/lighttpd2.pid
   else
     echo "Not running!"
@@ -50,7 +51,7 @@ lighttpd_stop() {
 lighttpd_restart() {
   lighttpd_stop
   PIDOF=
-  sleep 1
+  sleep 2
   lighttpd_start
 }