rpms/inn/devel inn.spec,1.34,1.35 innd.init,1.5,1.6

[Ondrej Dvoracek (odvorace)]

Author: odvorace

Update of /cvs/extras/rpms/inn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27729

Modified Files:
	inn.spec innd.init 
Log Message:
initscript review


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- inn.spec	29 Aug 2006 12:00:12 -0000	1.34
+++ inn.spec	1 Oct 2007 11:11:28 -0000	1.35
@@ -1,7 +1,7 @@
-Summary: The InterNetNews (INN) system, an Usenet news server.
+Summary: The InterNetNews (INN) system, an Usenet news server
 Name: inn
 Version: 2.4.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
@@ -291,6 +291,9 @@
 %{_mandir}/man1/inews*
 
 %changelog
+* Mon Oct 01 2006 Ondrej Dvoracek <odvorace at redhat.com> 2.4.3-7
+- initscript review (#246951)
+
 * Tue Aug 29 2006 Martin Stransky <stransky at redhat.com> 2.4.3-6
 - added dist tag
 - added patch from #204371 - innd.init script should use 


Index: innd.init
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/innd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- innd.init	29 Aug 2006 12:00:15 -0000	1.5
+++ innd.init	1 Oct 2007 11:11:28 -0000	1.6
@@ -10,115 +10,125 @@
 # processname: innd
 # pidfile: /var/run/news/innd.pid
 
+### BEGIN INIT INFO
+# Provides: innd
+# Required-Start: $network
+# Short-Description: InterNet News System
+# Description: inn is the most popular server for Usenet news. It allows \
+#              you to setup local news servers. It can be difficult to \
+#              set up properly though, so be sure to read /usr/share/doc/inn* \
+#              before trying.
+### END INIT INFO
+
 # Source function library.
 . /etc/init.d/functions
 
 # Get config.
 . /etc/sysconfig/network
 
-# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 0
-[ -d /etc/news ] || exit 0
-[ -f /etc/news/inn.conf ] || exit 0
-. /usr/lib/news/lib/innshellvars || exit 0
-[ -d "$SPOOLBASE" ] || exit 0
-[ -f "$HISTORY" -a -f "$HISTORY.hash" ] || {
-	echo $"Please run makehistory and/or makedbz before starting innd." >&2
-	exit 1
-}
-
 RETVAL=0
 
 start() {
-	echo -n $"Starting INND system: "
-	# INN uses too many un-checked shell scripts
-	unset LANG
-	unset LC_COLLATE
-        daemon --user news /etc/rc.news
-        RETVAL=$?
-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/innd
-        echo
+  # Check that networking is up.
+  [ "${NETWORKING}" = "no" ] && exit 1
+  [ -d /etc/news ] || exit 1
+  [ -f /etc/news/inn.conf ] || exit 6
+  . /usr/lib/news/lib/innshellvars || exit 1
+  [ -d "$SPOOLBASE" ] || exit 1
+  [ -f "$HISTORY" -a -f "$HISTORY.hash" ] || {
+    echo $"Please run makehistory and/or makedbz before starting innd." >&2
+    exit 1
+  }
+		
+  echo -n $"Starting INND system: "
+  # INN uses too many un-checked shell scripts
+  unset LANG
+  unset LC_COLLATE
+  daemon --user news /etc/rc.news
+  RETVAL=$?
+  [ $RETVAL -eq 0 ] && touch /var/lock/subsys/innd
+  echo
 }
 
 stop() {
-        if [ -f /var/run/news/innd.pid ]; then
-                echo -n $"Stopping INND service (gently): "
-		if "${NEWSBIN}/ctlinnd" -s -t 60 throttle shutting down &&
-		   sleep 30 &&
-		   "${NEWSBIN}/ctlinnd" -s -t 60 shutdown shutting down; then
-			success $"innd shutdown"
-		else
-			failure $"innd shutdown"
-	                echo -n $"Stopping INND service (the hard way): "
-	                killproc innd
-		fi
-                RETVAL=$?
-                [ $RETVAL -eq 0 ] && rm -f /var/run/news/innd.pid
-                echo
-        fi
-        if [ -f /var/run/news/innwatch.pid ]; then
-                echo -n $"Stopping INNWatch service: "
-                killproc innwatch -9
-                RETVAL=$?
-                [ $RETVAL -eq 0 ] && rm -f /var/run/news/innwatch.pid
-                echo
-        fi
-        if [ -f /var/run/news/innfeed.pid ]; then
-                echo -n $"Stopping INNFeed service: "
-                killproc innfeed -9
-                RETVAL=$?
-                [ $RETVAL -eq 0 ] && rm -f /var/run/news/innfeed.pid
-                echo
-        fi
-        if [ -f /var/run/news/actived.pid ]; then
-                echo -n $"Stopping INN actived service: "
-                killproc actived -9
-                RETVAL=$?
-                [ $RETVAL -eq 0 ] && rm -f /var/run/news/actived.pid
-                echo
-        fi
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/innd /var/lock/news/*
+  if [ -f /var/run/news/innd.pid ]; then
+    echo -n $"Stopping INND service (gently): "
+    if "${NEWSBIN}/ctlinnd" -s -t 60 throttle shutting down &&
+	     sleep 30 &&
+       "${NEWSBIN}/ctlinnd" -s -t 60 shutdown shutting down; then
+      success $"innd shutdown"
+    else
+      failure $"innd shutdown"
+      echo -n $"Stopping INND service (the hard way): "
+      killproc innd
+    fi
+    RETVAL=$?
+    [ $RETVAL -eq 0 ] && rm -f /var/run/news/innd.pid
+    echo
+  fi
+  if [ -f /var/run/news/innwatch.pid ]; then
+    echo -n $"Stopping INNWatch service: "
+    killproc innwatch -9
+    RETVAL=$?
+    [ $RETVAL -eq 0 ] && rm -f /var/run/news/innwatch.pid
+    echo
+  fi
+  if [ -f /var/run/news/innfeed.pid ]; then
+    echo -n $"Stopping INNFeed service: "
+    killproc innfeed -9
+    RETVAL=$?
+    [ $RETVAL -eq 0 ] && rm -f /var/run/news/innfeed.pid
+    echo
+  fi
+  if [ -f /var/run/news/actived.pid ]; then
+    echo -n $"Stopping INN actived service: "
+    killproc actived -9
+    RETVAL=$?
+    [ $RETVAL -eq 0 ] && rm -f /var/run/news/actived.pid
+    echo
+  fi
+  [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/innd /var/lock/news/*
 }
 
 reload() {
-        echo -n $"Reloading INN Service: "
-        killproc innd -HUP
-        RETVAL=$?
+  echo -n $"Reloading INN Service: "
+  killproc innd -HUP
+  RETVAL=$?
 }
 
 restart() {
-        stop
-        start                                                                   
+  stop
+  start                                                                   
 }
 
 # See how we were called.
 case "$1" in
   start)
-	start
-	;;
+    start
+  ;;
   stop)
-	stop
-	;;
+    stop
+  ;;
   status)
-	status innd
-        RETVAL=$?
-	;;
+    status innd
+    RETVAL=$?
+  ;;
   reload)
-	#XXX fixme, not working
-	#reload
-	restart
-	;;
+    #XXX fixme, not working
+    #reload
+    restart
+  ;;
   restart)
-	restart
-	;;
+    restart
+  ;;
   condrestart)
-	if [ -f /var/lock/subsys/innd ]; then
-	    restart
-	fi
+    if [ -f /var/lock/subsys/innd ]; then
+      restart
+    fi
 	;;
   *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
-	exit 1
+    echo $"Usage: $0 {start|stop|status|restart|condrestart}"
+    exit 3
 	;;
 esac