| 1 |
diff -Nur plague-0.4.4.1-orig/etc/plague-builder.config plague-0.4.4.1/etc/plague-builder.config |
| 2 |
--- plague-0.4.4.1-orig/etc/plague-builder.config 2005-08-31 21:29:21.000000000 +0200 |
| 3 |
+++ plague-0.4.4.1/etc/plague-builder.config 2008-01-09 02:54:42.000000000 +0100 |
| 4 |
@@ -1 +1,3 @@ |
| 5 |
CONFIG="/etc/plague/builder/plague-builder.cfg" |
| 6 |
+PIDFILE="/var/run/plague-builder.pid" |
| 7 |
+OPTIONS="-l /var/log/plague-builder.log" |
| 8 |
diff -Nur plague-0.4.4.1-orig/etc/plague-builder.init plague-0.4.4.1/etc/plague-builder.init |
| 9 |
--- plague-0.4.4.1-orig/etc/plague-builder.init 2006-03-12 06:48:18.000000000 +0100 |
| 10 |
+++ plague-0.4.4.1/etc/plague-builder.init 2008-01-09 03:02:18.000000000 +0100 |
| 11 |
@@ -1,46 +1,49 @@ |
| 12 |
-#!/bin/bash |
| 13 |
+#!/bin/sh |
| 14 |
# |
| 15 |
-# /etc/rc.d/init.d/plague-builder |
| 16 |
+# plague-builder Plague builder daemon |
| 17 |
# |
| 18 |
-# Start a plague builder instance |
| 19 |
-# |
| 20 |
-# chkconfig: 345 98 02 |
| 21 |
-# description: Starts a plague builder instance |
| 22 |
-# processname: plague-builder |
| 23 |
-# config: /etc/sysconfig/plague-builder |
| 24 |
-# pidfile: /var/run/plague-builder.pid |
| 25 |
+# chkconfig: - 98 02 |
| 26 |
+# description: Plague builder daemon for build-system slave machines |
| 27 |
+ |
| 28 |
+### BEGIN INIT INFO |
| 29 |
+# Provides: plague-builder |
| 30 |
+# Required-Start: $local_fs $network $named $time |
| 31 |
+# Required-Stop: $local_fs $network $named $time |
| 32 |
+# Should-Start: $syslog |
| 33 |
+# Should-Stop: $syslog |
| 34 |
+# Short-Description: Plague builder daemon |
| 35 |
+# Description: The Plague builder daemon does the actual RPM packaging |
| 36 |
+# on build-system slave machines. |
| 37 |
+### END INIT INFO |
| 38 |
|
| 39 |
# Source function library. |
| 40 |
. /etc/init.d/functions |
| 41 |
|
| 42 |
-servicename="plague-builder" |
| 43 |
-processname="plague-builder" |
| 44 |
-pidfile=/var/run/plague-builder.pid |
| 45 |
-logfile=/var/log/plague-builder.log |
| 46 |
- |
| 47 |
-if [ -f /etc/sysconfig/$servicename ]; then |
| 48 |
-. /etc/sysconfig/$servicename |
| 49 |
-fi |
| 50 |
+exec="/usr/bin/plague-builder" |
| 51 |
+prog="plague-builder" |
| 52 |
+ |
| 53 |
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog |
| 54 |
+ |
| 55 |
+lockfile=/var/lock/subsys/$prog |
| 56 |
|
| 57 |
start() { |
| 58 |
- if [ ! -f /var/lock/subsys/$servicename ]; then |
| 59 |
- echo -n $"Starting $servicename: " |
| 60 |
- daemon --check $servicename $processname -d -c $CONFIG -p $pidfile -l $logfile |
| 61 |
- RETVAL=$? |
| 62 |
- echo |
| 63 |
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename |
| 64 |
- fi |
| 65 |
-} |
| 66 |
+ [ -x $exec ] || exit 5 |
| 67 |
+ [ -f $config ] || exit 6 |
| 68 |
+ echo -n $"Starting $prog: " |
| 69 |
+ daemon --check $prog $exec -d -c $CONFIG -p $PIDFILE $OPTIONS |
| 70 |
+ retval=$? |
| 71 |
+ echo |
| 72 |
+ [ $retval -eq 0 ] && touch $lockfile |
| 73 |
+ return $retval |
| 74 |
+} |
| 75 |
|
| 76 |
stop() { |
| 77 |
- echo -n $"Stopping $servicename: " |
| 78 |
- killproc -p $pidfile $servicename |
| 79 |
- RETVAL=$? |
| 80 |
- echo |
| 81 |
- if [ $RETVAL -eq 0 ]; then |
| 82 |
- rm -f /var/lock/subsys/$servicename |
| 83 |
- rm -f $pidfile |
| 84 |
- fi |
| 85 |
+ echo -n $"Stopping $prog: " |
| 86 |
+ killproc -p $PIDFILE -d 5 $prog |
| 87 |
+ retval=$? |
| 88 |
+ echo |
| 89 |
+ [ $retval -eq 0 ] && rm -f $lockfile |
| 90 |
+ return $retval |
| 91 |
} |
| 92 |
|
| 93 |
restart() { |
| 94 |
@@ -48,27 +51,51 @@ |
| 95 |
start |
| 96 |
} |
| 97 |
|
| 98 |
+reload() { |
| 99 |
+ restart |
| 100 |
+} |
| 101 |
+ |
| 102 |
+force_reload() { |
| 103 |
+ restart |
| 104 |
+} |
| 105 |
+ |
| 106 |
+rh_status() { |
| 107 |
+ # run checks to determine if the service is running or use generic status |
| 108 |
+ status $prog |
| 109 |
+} |
| 110 |
+ |
| 111 |
+rh_status_q() { |
| 112 |
+ rh_status >/dev/null 2>&1 |
| 113 |
+} |
| 114 |
+ |
| 115 |
case "$1" in |
| 116 |
- start) |
| 117 |
- start |
| 118 |
- ;; |
| 119 |
- stop) |
| 120 |
- stop |
| 121 |
- ;; |
| 122 |
- status) |
| 123 |
- status -p $pidfile $processname |
| 124 |
- RETVAL=$? |
| 125 |
- ;; |
| 126 |
- restart) |
| 127 |
- stop |
| 128 |
- start |
| 129 |
- ;; |
| 130 |
- condrestart) |
| 131 |
- [ -f /var/lock/subsys/$servicename ] && restart || : |
| 132 |
- ;; |
| 133 |
- *) |
| 134 |
- echo "Usage: $0 {start|stop|status|reload|restart[|probe]" |
| 135 |
- exit 1 |
| 136 |
- ;; |
| 137 |
+ start) |
| 138 |
+ rh_status_q && exit 0 |
| 139 |
+ $1 |
| 140 |
+ ;; |
| 141 |
+ stop) |
| 142 |
+ rh_status_q || exit 0 |
| 143 |
+ $1 |
| 144 |
+ ;; |
| 145 |
+ restart) |
| 146 |
+ $1 |
| 147 |
+ ;; |
| 148 |
+ reload) |
| 149 |
+ rh_status_q || exit 7 |
| 150 |
+ $1 |
| 151 |
+ ;; |
| 152 |
+ force-reload) |
| 153 |
+ force_reload |
| 154 |
+ ;; |
| 155 |
+ status) |
| 156 |
+ rh_status |
| 157 |
+ ;; |
| 158 |
+ condrestart|try-restart) |
| 159 |
+ rh_status_q || exit 0 |
| 160 |
+ restart |
| 161 |
+ ;; |
| 162 |
+ *) |
| 163 |
+ echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}" |
| 164 |
+ exit 2 |
| 165 |
esac |
| 166 |
exit $? |
| 167 |
diff -Nur plague-0.4.4.1-orig/etc/plague-server.config plague-0.4.4.1/etc/plague-server.config |
| 168 |
--- plague-0.4.4.1-orig/etc/plague-server.config 2005-08-15 05:18:19.000000000 +0200 |
| 169 |
+++ plague-0.4.4.1/etc/plague-server.config 2008-01-09 02:54:34.000000000 +0100 |
| 170 |
@@ -1 +1,3 @@ |
| 171 |
-CONFIG=/etc/plague/server/plague-server.cfg |
| 172 |
+CONFIG="/etc/plague/server/plague-server.cfg" |
| 173 |
+PIDFILE="/var/run/plague-server.pid" |
| 174 |
+OPTIONS="-l /var/log/plague-server.log" |
| 175 |
diff -Nur plague-0.4.4.1-orig/etc/plague-server.init plague-0.4.4.1/etc/plague-server.init |
| 176 |
--- plague-0.4.4.1-orig/etc/plague-server.init 2006-03-12 06:48:18.000000000 +0100 |
| 177 |
+++ plague-0.4.4.1/etc/plague-server.init 2008-01-09 03:02:11.000000000 +0100 |
| 178 |
@@ -1,46 +1,50 @@ |
| 179 |
-#!/bin/bash |
| 180 |
+#!/bin/sh |
| 181 |
# |
| 182 |
-# /etc/rc.d/init.d/plague-server |
| 183 |
+# plague-server Plague server daemon |
| 184 |
# |
| 185 |
-# Start a plague server instance |
| 186 |
-# |
| 187 |
-# chkconfig: 345 98 02 |
| 188 |
-# description: Starts a plague server instance |
| 189 |
-# processname: plague-server |
| 190 |
-# config: /etc/sysconfig/plague-server |
| 191 |
-# pidfile: /var/run/plague-server.pid |
| 192 |
+# chkconfig: - 98 02 |
| 193 |
+# description: Plague server daemon for build-system master machines |
| 194 |
+ |
| 195 |
+### BEGIN INIT INFO |
| 196 |
+# Provides: plague-server |
| 197 |
+# Required-Start: $local_fs $network $named $time |
| 198 |
+# Required-Stop: $local_fs $network $named $time |
| 199 |
+# Should-Start: $syslog |
| 200 |
+# Should-Stop: $syslog |
| 201 |
+# Short-Description: Plague server daemon |
| 202 |
+# Description: The Plague build-system is a client/server distributed |
| 203 |
+# build-system for building RPM packages. This package provides the |
| 204 |
+# master server daemon. |
| 205 |
+### END INIT INFO |
| 206 |
|
| 207 |
# Source function library. |
| 208 |
. /etc/init.d/functions |
| 209 |
|
| 210 |
-servicename="plague-server" |
| 211 |
-processname="plague-server" |
| 212 |
-pidfile=/var/run/plague-server.pid |
| 213 |
-logfile=/var/log/plague-server.log |
| 214 |
- |
| 215 |
-if [ -f /etc/sysconfig/$servicename ]; then |
| 216 |
-. /etc/sysconfig/$servicename |
| 217 |
-fi |
| 218 |
+exec="/usr/bin/plague-server" |
| 219 |
+prog="plague-server" |
| 220 |
+ |
| 221 |
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog |
| 222 |
+ |
| 223 |
+lockfile=/var/lock/subsys/$prog |
| 224 |
|
| 225 |
start() { |
| 226 |
- if [ ! -f /var/lock/subsys/$servicename ]; then |
| 227 |
- echo -n $"Starting $servicename: " |
| 228 |
- daemon --check $servicename $processname -d -c $CONFIG -p $pidfile -l $logfile |
| 229 |
- RETVAL=$? |
| 230 |
- echo |
| 231 |
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename |
| 232 |
- fi |
| 233 |
-} |
| 234 |
+ [ -x $exec ] || exit 5 |
| 235 |
+ [ -f $config ] || exit 6 |
| 236 |
+ echo -n $"Starting $prog: " |
| 237 |
+ daemon --check $prog $exec -d -c $CONFIG -p $PIDFILE $OPTIONS |
| 238 |
+ retval=$? |
| 239 |
+ echo |
| 240 |
+ [ $retval -eq 0 ] && touch $lockfile |
| 241 |
+ return $retval |
| 242 |
+} |
| 243 |
|
| 244 |
stop() { |
| 245 |
- echo -n $"Stopping $servicename: " |
| 246 |
- killproc -p $pidfile $servicename |
| 247 |
- RETVAL=$? |
| 248 |
- echo |
| 249 |
- if [ $RETVAL -eq 0 ]; then |
| 250 |
- rm -f /var/lock/subsys/$servicename |
| 251 |
- rm -f $pidfile |
| 252 |
- fi |
| 253 |
+ echo -n $"Stopping $prog: " |
| 254 |
+ killproc -p $PIDFILE -d 5 $prog |
| 255 |
+ retval=$? |
| 256 |
+ echo |
| 257 |
+ [ $retval -eq 0 ] && rm -f $lockfile |
| 258 |
+ return $retval |
| 259 |
} |
| 260 |
|
| 261 |
restart() { |
| 262 |
@@ -48,27 +52,51 @@ |
| 263 |
start |
| 264 |
} |
| 265 |
|
| 266 |
+reload() { |
| 267 |
+ restart |
| 268 |
+} |
| 269 |
+ |
| 270 |
+force_reload() { |
| 271 |
+ restart |
| 272 |
+} |
| 273 |
+ |
| 274 |
+rh_status() { |
| 275 |
+ # run checks to determine if the service is running or use generic status |
| 276 |
+ status $prog |
| 277 |
+} |
| 278 |
+ |
| 279 |
+rh_status_q() { |
| 280 |
+ rh_status >/dev/null 2>&1 |
| 281 |
+} |
| 282 |
+ |
| 283 |
case "$1" in |
| 284 |
- start) |
| 285 |
- start |
| 286 |
- ;; |
| 287 |
- stop) |
| 288 |
- stop |
| 289 |
- ;; |
| 290 |
- status) |
| 291 |
- status -p $pidfile $processname |
| 292 |
- RETVAL=$? |
| 293 |
- ;; |
| 294 |
- restart) |
| 295 |
- stop |
| 296 |
- start |
| 297 |
- ;; |
| 298 |
- condrestart) |
| 299 |
- [ -f /var/lock/subsys/$servicename ] && restart || : |
| 300 |
- ;; |
| 301 |
- *) |
| 302 |
- echo "Usage: $0 {start|stop|status|reload|restart[|probe]" |
| 303 |
- exit 1 |
| 304 |
- ;; |
| 305 |
+ start) |
| 306 |
+ rh_status_q && exit 0 |
| 307 |
+ $1 |
| 308 |
+ ;; |
| 309 |
+ stop) |
| 310 |
+ rh_status_q || exit 0 |
| 311 |
+ $1 |
| 312 |
+ ;; |
| 313 |
+ restart) |
| 314 |
+ $1 |
| 315 |
+ ;; |
| 316 |
+ reload) |
| 317 |
+ rh_status_q || exit 7 |
| 318 |
+ $1 |
| 319 |
+ ;; |
| 320 |
+ force-reload) |
| 321 |
+ force_reload |
| 322 |
+ ;; |
| 323 |
+ status) |
| 324 |
+ rh_status |
| 325 |
+ ;; |
| 326 |
+ condrestart|try-restart) |
| 327 |
+ rh_status_q || exit 0 |
| 328 |
+ restart |
| 329 |
+ ;; |
| 330 |
+ *) |
| 331 |
+ echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}" |
| 332 |
+ exit 2 |
| 333 |
esac |
| 334 |
exit $? |
Parent Directory
| 
Revision Log
| 
Revision Graph
