Sophie

Sophie

distrib > Fedora > 13 > i386 > media > updates-src > by-pkgid > 0b91cf6ce22e2364f6c1be47ebb667b0 > files > 2

yaws-1.89-3.fc13.src.rpm

From: Lubomir Rintel (Good Data) <lubo.rintel@gooddata.com>

Do not enable the service by default.
More robustly determine if we're running.

diff -up yaws-1.85/scripts/redhat/yaws.init.d.sysvinit yaws-1.85/scripts/redhat/yaws.init.d
--- yaws-1.85/scripts/redhat/yaws.init.d.sysvinit	2009-10-17 23:07:14.000000000 +0200
+++ yaws-1.85/scripts/redhat/yaws.init.d	2009-11-02 21:43:14.000000000 +0100
@@ -4,7 +4,7 @@
 #
 # config: /etc/yaws.conf
 #
-# chkconfig: 2345 65 35
+# chkconfig: - 65 35
 # description: yaws - Erlang enabled http server
 # use "/sbin/chkconfig --add yaws" to install
 
@@ -21,6 +21,7 @@ prog=yaws
 yawsid=default
 #yawsid_opts="--id $yawsid"
 conf="--conf %etcdir%yaws/yaws.conf"
+[ "$HOME" ] || HOME=/root
 
 start() {
         echo -n $"Starting $prog: "
@@ -62,7 +63,7 @@ case "$1" in
 	stop
 	;;
   status)
-        $yaws -S
+	[ -f ${HOME}/.yaws/yaws/default/CTL ] && $yaws -S
 	RETVAL=$?
 	;;
   restart)
@@ -70,7 +71,7 @@ case "$1" in
 	start
 	;;
   condrestart)
-	if [ -f /tmp/yaws.ctl ] ; then
+	if [ -f ${HOME}/.yaws/yaws/default/CTL ] && $yaws -S >/dev/null 2>&1; then
 		stop
 		start
 	fi