From dca3a95be2423ea7e4fe79cbc82deb1367822f72 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 3 Feb 2003 07:56:44 +0000
Subject: sanitize draxktools server service script: - no gratuitous shell
 forking - now can be debugged through "sh -x" - use std shell service lib -
 make it print [OK] || [FAILLED]

---
 .../standalone/interactive_http/miniserv.init      | 49 +++++++++++++---------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/perl-install/standalone/interactive_http/miniserv.init b/perl-install/standalone/interactive_http/miniserv.init
index e7673083c..c9aaf9aeb 100644
--- a/perl-install/standalone/interactive_http/miniserv.init
+++ b/perl-install/standalone/interactive_http/miniserv.init
@@ -2,22 +2,38 @@
 # chkconfig: 235 99 00
 # description: Start or stop the miniserv administration server
 
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+subsys=/var/lock/subsys/drakxtools_http
 name=drakxtools_http
 server=/usr/share/libDrakX/$name/miniserv.pl
 
+start ()
+{
+	action "Starting $name: " perl $server /etc/$name/conf
+	touch $subsys
+	echo $name
+}
+
+stop ()
+{
+	action "Shutting down $name: " kill `cat /var/run/$name.pid`
+	rm -f $subsys
+	echo $name
+}
+
+restart ()
+{
+	stop
+	start
+}
+
 case "$1" in
 'start')
-	echo -n "Starting $name: "
-	perl $server /etc/$name/conf
-	touch /var/lock/subsys/drakxtools_http
-	echo $name
-	;;
+	start;;
 'stop')
-	echo -n "Shutting down $name: "
-	kill `cat /var/run/$name.pid`
-	rm -f /var/lock/subsys/drakxtools_http
-	echo $name
-	;;
+	stop;;
 'status')
 	if [ -s /var/run/$name.pid ]; then
 	    pid=`cat /var/run/$name.pid`
@@ -32,18 +48,11 @@ case "$1" in
 	fi
 	;;
 'restart')
-	$0 stop
-	$0 start
-	;;
+	restart;;
 'reload')
-        $0 stop
-        $0 start
-        ;;
+        restart;;
 'condrestart')
-	if [ -f /var/lock/subsys/drakxtools_http ]; then
-            $0 restart
-        fi
-        ;;
+	[[ -f $subsys ]] && restart;;
 *)
 	echo "Usage: $0 {start|stop|restart|status|reload|condrestart}"
 	;;
-- 
cgit v1.2.1