1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLEANUP: extract temporary $BIN to eliminate duplication

Browse Source 
Signed-off-by: Adam Spiers <aspiers@suse.com>
This commit is contained in:
Adam Spiers 2015-02-23 15:28:37 +00:00 committed by Willy Tarreau
parent 5e71b6f803
commit 85bb5ca39b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
examples/haproxy.init
View File

@ -32,20 +32,22 @@ if [ -L $0 ]; then
BASENAME=`basename $BASENAME` BASENAME=`basename $BASENAME`
fi fi
BIN=/usr/sbin/$BASENAME
CFG=/etc/$BASENAME/$BASENAME.cfg CFG=/etc/$BASENAME/$BASENAME.cfg
[ -f $CFG ] || exit 1 [ -f $CFG ] || exit 1
RETVAL=0 RETVAL=0
start() { start() {
/usr/sbin/$BASENAME -c -q -f $CFG $BIN -c -q -f $CFG
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Errors found in configuration file, check it with '$BASENAME check'." echo "Errors found in configuration file, check it with '$BASENAME check'."
return 1 return 1
fi fi
echo -n "Starting $BASENAME: " echo -n "Starting $BASENAME: "
daemon /usr/sbin/$BASENAME -D -f $CFG -p /var/run/$BASENAME.pid daemon $BIN -D -f $CFG -p /var/run/$BASENAME.pid
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$BASENAME [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$BASENAME
@ -63,7 +65,7 @@ stop() {
} }
restart() { restart() {
/usr/sbin/$BASENAME -c -q -f $CFG $BIN -c -q -f $CFG
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Errors found in configuration file, check it with '$BASENAME check'." echo "Errors found in configuration file, check it with '$BASENAME check'."
return 1 return 1
@ -73,16 +75,16 @@ restart() {
} }
reload() { reload() {
/usr/sbin/$BASENAME -c -q -f $CFG $BIN -c -q -f $CFG
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Errors found in configuration file, check it with '$BASENAME check'." echo "Errors found in configuration file, check it with '$BASENAME check'."
return 1 return 1
fi fi
/usr/sbin/$BASENAME -D -f $CFG -p /var/run/$BASENAME.pid -sf $(cat /var/run/$BASENAME.pid) $BIN -D -f $CFG -p /var/run/$BASENAME.pid -sf $(cat /var/run/$BASENAME.pid)
} }
check() { check() {
/usr/sbin/$BASENAME -c -q -V -f $CFG $BIN -c -q -V -f $CFG
} }
rhstatus() { rhstatus() {