extras-buildsys/etc plague-builder.config, 1.5, 1.6 plague-builder.init, 1.11, 1.12 plague-server.config, 1.2, 1.3 plague-server.init, 1.6, 1.7
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Tue Nov 13 19:29:23 UTC 2007
Author: mschwendt
Update of /cvs/fedora/extras-buildsys/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7176/d
Modified Files:
plague-builder.config plague-builder.init plague-server.config
plague-server.init
Log Message:
Update initscripts for LSB. Move logfile and pidfile definition into sysconfig scripts.
Index: plague-builder.config
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plague-builder.config 31 Aug 2005 19:29:21 -0000 1.5
+++ plague-builder.config 13 Nov 2007 19:29:21 -0000 1.6
@@ -1 +1,3 @@
CONFIG="/etc/plague/builder/plague-builder.cfg"
+LOGFILE="/var/log/plague-builder.log"
+PIDFILE="/var/run/plague-builder.pid"
Index: plague-builder.init
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plague-builder.init 18 Sep 2007 18:19:49 -0000 1.11
+++ plague-builder.init 13 Nov 2007 19:29:21 -0000 1.12
@@ -1,46 +1,49 @@
-#!/bin/bash
+#!/bin/sh
#
-# /etc/rc.d/init.d/plague-builder
+# plague-builder Plague builder daemon
#
-# Start a plague builder instance
-#
-# chkconfig: 345 98 02
-# description: Starts a plague builder instance
-# processname: plague-builder
-# config: /etc/sysconfig/plague-builder
-# pidfile: /var/run/plague-builder.pid
+# chkconfig: - 98 02
+# description: Plague builder daemon for build-system slave machines
+
+### BEGIN INIT INFO
+# Provides: plague-builder
+# Required-Start: $local_fs $network $named $time
+# Required-Stop: $local_fs $network $named $time
+# Should-Start: $syslog
+# Should-Stop: $syslog
+# Short-Description: Plague builder daemon
+# Description: The Plague builder daemon does the actual RPM packaging
+# on build-system slave machines.
+### END INIT INFO
# Source function library.
. /etc/init.d/functions
-servicename="plague-builder"
-processname="plague-builder"
-pidfile=/var/run/plague-builder.pid
-logfile=/var/log/plague-builder.log
-
-if [ -f /etc/sysconfig/$servicename ]; then
-. /etc/sysconfig/$servicename
-fi
+exec="/usr/bin/plague-builder"
+prog="plague-builder"
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
start() {
- if [ ! -f /var/lock/subsys/$servicename ]; then
- echo -n $"Starting $servicename: "
- daemon --check $servicename $processname -d -c $CONFIG -p $pidfile -l $logfile
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename
- fi
-}
+ [ -x $exec ] || exit 5
+ [ -f $config ] || exit 6
+ echo -n $"Starting $prog: "
+ daemon --check $prog $exec -d -c $CONFIG -p $PIDFILE -l $LOGFILE
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && touch $lockfile
+ return $retval
+}
stop() {
- echo -n $"Stopping $servicename: "
- killproc -p $pidfile $servicename
- RETVAL=$?
- echo
- if [ $RETVAL -eq 0 ]; then
- rm -f /var/lock/subsys/$servicename
- rm -f $pidfile
- fi
+ echo -n $"Stopping $prog: "
+ killproc $prog
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && rm -f $lockfile
+ return $retval
}
restart() {
@@ -48,27 +51,51 @@
start
}
+reload() {
+ restart
+}
+
+force_reload() {
+ restart
+}
+
+rh_status() {
+ # run checks to determine if the service is running or use generic status
+ status $prog
+}
+
+rh_status_q() {
+ rh_status >/dev/null 2>&1
+}
+
case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status -p $pidfile $processname
- RETVAL=$?
- ;;
- restart)
- stop
- start
- ;;
- condrestart)
- [ -f /var/lock/subsys/$servicename ] && restart || :
- ;;
- *)
- echo "Usage: $0 {start|stop|status|restart|condrestart}"
- exit 1
- ;;
+ start)
+ rh_status_q && exit 0
+ $1
+ ;;
+ stop)
+ rh_status_q || exit 0
+ $1
+ ;;
+ restart)
+ $1
+ ;;
+ reload)
+ rh_status_q || exit 7
+ $1
+ ;;
+ force-reload)
+ force_reload
+ ;;
+ status)
+ rh_status
+ ;;
+ condrestart|try-restart)
+ rh_status_q || exit 0
+ restart
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+ exit 2
esac
exit $?
Index: plague-server.config
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plague-server.config 15 Aug 2005 03:18:19 -0000 1.2
+++ plague-server.config 13 Nov 2007 19:29:21 -0000 1.3
@@ -1 +1,3 @@
-CONFIG=/etc/plague/server/plague-server.cfg
+CONFIG="/etc/plague/server/plague-server.cfg"
+LOGFILE="/var/log/plague-server.log"
+PIDFILE="/var/run/plague-server.pid"
Index: plague-server.init
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plague-server.init 18 Sep 2007 18:19:49 -0000 1.6
+++ plague-server.init 13 Nov 2007 19:29:21 -0000 1.7
@@ -1,46 +1,50 @@
-#!/bin/bash
+#!/bin/sh
#
-# /etc/rc.d/init.d/plague-server
+# plague-server Plague server daemon
#
-# Start a plague server instance
-#
-# chkconfig: 345 98 02
-# description: Starts a plague server instance
-# processname: plague-server
-# config: /etc/sysconfig/plague-server
-# pidfile: /var/run/plague-server.pid
+# chkconfig: - 98 02
+# description: Plague server daemon for build-system master machines
+
+### BEGIN INIT INFO
+# Provides: plague-server
+# Required-Start: $local_fs $network $named $time
+# Required-Stop: $local_fs $network $named $time
+# Should-Start: $syslog
+# Should-Stop: $syslog
+# Short-Description: Plague server daemon
+# Description: The Plague build-system is a client/server distributed
+# build-system for building RPM packages. This package provides the
+# master server daemon.
+### END INIT INFO
# Source function library.
. /etc/init.d/functions
-servicename="plague-server"
-processname="plague-server"
-pidfile=/var/run/plague-server.pid
-logfile=/var/log/plague-server.log
-
-if [ -f /etc/sysconfig/$servicename ]; then
-. /etc/sysconfig/$servicename
-fi
+exec="/usr/bin/plague-server"
+prog="plague-server"
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
start() {
- if [ ! -f /var/lock/subsys/$servicename ]; then
- echo -n $"Starting $servicename: "
- daemon --check $servicename $processname -d -c $CONFIG -p $pidfile -l $logfile
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename
- fi
-}
+ [ -x $exec ] || exit 5
+ [ -f $config ] || exit 6
+ echo -n $"Starting $prog: "
+ daemon --check $prog $exec -d -c $CONFIG -p $PIDFILE -l $LOGFILE
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && touch $lockfile
+ return $retval
+}
stop() {
- echo -n $"Stopping $servicename: "
- killproc -p $pidfile $servicename
- RETVAL=$?
- echo
- if [ $RETVAL -eq 0 ]; then
- rm -f /var/lock/subsys/$servicename
- rm -f $pidfile
- fi
+ echo -n $"Stopping $prog: "
+ killproc $prog
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && rm -f $lockfile
+ return $retval
}
restart() {
@@ -48,27 +52,51 @@
start
}
+reload() {
+ restart
+}
+
+force_reload() {
+ restart
+}
+
+rh_status() {
+ # run checks to determine if the service is running or use generic status
+ status $prog
+}
+
+rh_status_q() {
+ rh_status >/dev/null 2>&1
+}
+
case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status -p $pidfile $processname
- RETVAL=$?
- ;;
- restart)
- stop
- start
- ;;
- condrestart)
- [ -f /var/lock/subsys/$servicename ] && restart || :
- ;;
- *)
- echo "Usage: $0 {start|stop|status|restart|condrestart}"
- exit 1
- ;;
+ start)
+ rh_status_q && exit 0
+ $1
+ ;;
+ stop)
+ rh_status_q || exit 0
+ $1
+ ;;
+ restart)
+ $1
+ ;;
+ reload)
+ rh_status_q || exit 7
+ $1
+ ;;
+ force-reload)
+ force_reload
+ ;;
+ status)
+ rh_status
+ ;;
+ condrestart|try-restart)
+ rh_status_q || exit 0
+ restart
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+ exit 2
esac
exit $?
More information about the fedora-extras-commits
mailing list