From af430f99462ddb82192642b0031c97b9a4e8bc72 Mon Sep 17 00:00:00 2001 From: "Andreas Burchert (scarya)" Date: Mon, 19 Sep 2011 10:50:23 +0200 Subject: [PATCH] modernized bash init-scripts, fixes #889 Thanks to arnoldB. --- .../debian_lenny/nginx/etc_init.d_php-fcgi | 30 +++++++++---------- .../debian_squeeze/nginx/etc_init.d_php-fcgi | 30 +++++++++---------- .../gentoo/nginx/etc_init.d_php-fcgi | 30 +++++++++---------- .../ubuntu_hardy/nginx/etc_init.d_php-fcgi | 30 +++++++++---------- 4 files changed, 60 insertions(+), 60 deletions(-) diff --git a/templates/misc/configfiles/debian_lenny/nginx/etc_init.d_php-fcgi b/templates/misc/configfiles/debian_lenny/nginx/etc_init.d_php-fcgi index cb1c9fca..3971ab4a 100644 --- a/templates/misc/configfiles/debian_lenny/nginx/etc_init.d_php-fcgi +++ b/templates/misc/configfiles/debian_lenny/nginx/etc_init.d_php-fcgi @@ -1,25 +1,25 @@ #!/bin/bash -BIND=127.0.0.1:8888 -USER=www-data -PHP_FCGI_CHILDREN=15 -PHP_FCGI_MAX_REQUESTS=1000 +BIND="127.0.0.1:8888" +USER="www-data" +PHP_FCGI_CHILDREN="15" +PHP_FCGI_MAX_REQUESTS="1000" -PHP_CGI=/usr/bin/php-cgi -PHP_CGI_NAME=`basename $PHP_CGI` -PHP_CGI_ARGS="- USER=$USER PATH=/usr/bin PHP_FCGI_CHILDREN=$PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS=$PHP_FCGI_MAX_REQUESTS $PHP_CGI -b $BIND" -RETVAL=0 +PHP_CGI="/usr/bin/php-cgi" +PHP_CGI_NAME="$(basename ${PHP_CGI})" +PHP_CGI_ARGS="- USER=${USER} PATH=/usr/bin PHP_FCGI_CHILDREN=${PHP_FCGI_CHILDREN} PHP_FCGI_MAX_REQUESTS=${PHP_FCGI_MAX_REQUESTS} ${PHP_CGI} -b ${BIND}" +RETVAL="0" start() { echo -n "Starting PHP FastCGI: " - start-stop-daemon --quiet --start --background --chuid "$USER" --exec /usr/bin/env -- $PHP_CGI_ARGS - RETVAL=$? - echo "$PHP_CGI_NAME." + start-stop-daemon --quiet --start --background --chuid "$USER" --exec /usr/bin/env -- "$PHP_CGI_ARGS" + RETVAL="$?" + echo "${PHP_CGI_NAME}." } stop() { echo -n "Stopping PHP FastCGI: " - killall -q -w -u $USER $PHP_CGI - RETVAL=$? - echo "$PHP_CGI_NAME." + killall -q -w -u "${USER} ${PHP_CGI}" + RETVAL="$?" + echo "${PHP_CGI_NAME}." } case "$1" in @@ -38,4 +38,4 @@ case "$1" in exit 1 ;; esac -exit $RETVAL +exit "$RETVAL" diff --git a/templates/misc/configfiles/debian_squeeze/nginx/etc_init.d_php-fcgi b/templates/misc/configfiles/debian_squeeze/nginx/etc_init.d_php-fcgi index cb1c9fca..3971ab4a 100644 --- a/templates/misc/configfiles/debian_squeeze/nginx/etc_init.d_php-fcgi +++ b/templates/misc/configfiles/debian_squeeze/nginx/etc_init.d_php-fcgi @@ -1,25 +1,25 @@ #!/bin/bash -BIND=127.0.0.1:8888 -USER=www-data -PHP_FCGI_CHILDREN=15 -PHP_FCGI_MAX_REQUESTS=1000 +BIND="127.0.0.1:8888" +USER="www-data" +PHP_FCGI_CHILDREN="15" +PHP_FCGI_MAX_REQUESTS="1000" -PHP_CGI=/usr/bin/php-cgi -PHP_CGI_NAME=`basename $PHP_CGI` -PHP_CGI_ARGS="- USER=$USER PATH=/usr/bin PHP_FCGI_CHILDREN=$PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS=$PHP_FCGI_MAX_REQUESTS $PHP_CGI -b $BIND" -RETVAL=0 +PHP_CGI="/usr/bin/php-cgi" +PHP_CGI_NAME="$(basename ${PHP_CGI})" +PHP_CGI_ARGS="- USER=${USER} PATH=/usr/bin PHP_FCGI_CHILDREN=${PHP_FCGI_CHILDREN} PHP_FCGI_MAX_REQUESTS=${PHP_FCGI_MAX_REQUESTS} ${PHP_CGI} -b ${BIND}" +RETVAL="0" start() { echo -n "Starting PHP FastCGI: " - start-stop-daemon --quiet --start --background --chuid "$USER" --exec /usr/bin/env -- $PHP_CGI_ARGS - RETVAL=$? - echo "$PHP_CGI_NAME." + start-stop-daemon --quiet --start --background --chuid "$USER" --exec /usr/bin/env -- "$PHP_CGI_ARGS" + RETVAL="$?" + echo "${PHP_CGI_NAME}." } stop() { echo -n "Stopping PHP FastCGI: " - killall -q -w -u $USER $PHP_CGI - RETVAL=$? - echo "$PHP_CGI_NAME." + killall -q -w -u "${USER} ${PHP_CGI}" + RETVAL="$?" + echo "${PHP_CGI_NAME}." } case "$1" in @@ -38,4 +38,4 @@ case "$1" in exit 1 ;; esac -exit $RETVAL +exit "$RETVAL" diff --git a/templates/misc/configfiles/gentoo/nginx/etc_init.d_php-fcgi b/templates/misc/configfiles/gentoo/nginx/etc_init.d_php-fcgi index 530f060a..4ce5fd3e 100644 --- a/templates/misc/configfiles/gentoo/nginx/etc_init.d_php-fcgi +++ b/templates/misc/configfiles/gentoo/nginx/etc_init.d_php-fcgi @@ -1,25 +1,25 @@ #!/bin/bash -BIND=127.0.0.1:8888 -USER=nginx -PHP_FCGI_CHILDREN=15 -PHP_FCGI_MAX_REQUESTS=1000 +BIND="127.0.0.1:8888" +USER="nginx" +PHP_FCGI_CHILDREN="15" +PHP_FCGI_MAX_REQUESTS="1000" -PHP_CGI=/usr/bin/php-cgi -PHP_CGI_NAME=`basename $PHP_CGI` -PHP_CGI_ARGS="- USER=$USER PATH=/usr/bin PHP_FCGI_CHILDREN=$PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS=$PHP_FCGI_MAX_REQUESTS $PHP_CGI -b $BIND" -RETVAL=0 +PHP_CGI="/usr/bin/php-cgi" +PHP_CGI_NAME="$(basename ${PHP_CGI})" +PHP_CGI_ARGS="- USER=${USER} PATH=/usr/bin PHP_FCGI_CHILDREN=${PHP_FCGI_CHILDREN} PHP_FCGI_MAX_REQUESTS=${PHP_FCGI_MAX_REQUESTS} ${PHP_CGI} -b ${BIND}" +RETVAL="0" start() { echo -n "Starting PHP FastCGI: " - start-stop-daemon --quiet --start --background --chuid "$USER" --exec /usr/bin/env -- $PHP_CGI_ARGS - RETVAL=$? - echo "$PHP_CGI_NAME." + start-stop-daemon --quiet --start --background --chuid "$USER" --exec /usr/bin/env -- "$PHP_CGI_ARGS" + RETVAL="$?" + echo "${PHP_CGI_NAME}." } stop() { echo -n "Stopping PHP FastCGI: " - killall -q -w -u $USER $PHP_CGI - RETVAL=$? - echo "$PHP_CGI_NAME." + killall -q -w -u "${USER} ${PHP_CGI}" + RETVAL="$?" + echo "${PHP_CGI_NAME}." } case "$1" in @@ -38,4 +38,4 @@ case "$1" in exit 1 ;; esac -exit $RETVAL +exit "$RETVAL" diff --git a/templates/misc/configfiles/ubuntu_hardy/nginx/etc_init.d_php-fcgi b/templates/misc/configfiles/ubuntu_hardy/nginx/etc_init.d_php-fcgi index cb1c9fca..3971ab4a 100644 --- a/templates/misc/configfiles/ubuntu_hardy/nginx/etc_init.d_php-fcgi +++ b/templates/misc/configfiles/ubuntu_hardy/nginx/etc_init.d_php-fcgi @@ -1,25 +1,25 @@ #!/bin/bash -BIND=127.0.0.1:8888 -USER=www-data -PHP_FCGI_CHILDREN=15 -PHP_FCGI_MAX_REQUESTS=1000 +BIND="127.0.0.1:8888" +USER="www-data" +PHP_FCGI_CHILDREN="15" +PHP_FCGI_MAX_REQUESTS="1000" -PHP_CGI=/usr/bin/php-cgi -PHP_CGI_NAME=`basename $PHP_CGI` -PHP_CGI_ARGS="- USER=$USER PATH=/usr/bin PHP_FCGI_CHILDREN=$PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS=$PHP_FCGI_MAX_REQUESTS $PHP_CGI -b $BIND" -RETVAL=0 +PHP_CGI="/usr/bin/php-cgi" +PHP_CGI_NAME="$(basename ${PHP_CGI})" +PHP_CGI_ARGS="- USER=${USER} PATH=/usr/bin PHP_FCGI_CHILDREN=${PHP_FCGI_CHILDREN} PHP_FCGI_MAX_REQUESTS=${PHP_FCGI_MAX_REQUESTS} ${PHP_CGI} -b ${BIND}" +RETVAL="0" start() { echo -n "Starting PHP FastCGI: " - start-stop-daemon --quiet --start --background --chuid "$USER" --exec /usr/bin/env -- $PHP_CGI_ARGS - RETVAL=$? - echo "$PHP_CGI_NAME." + start-stop-daemon --quiet --start --background --chuid "$USER" --exec /usr/bin/env -- "$PHP_CGI_ARGS" + RETVAL="$?" + echo "${PHP_CGI_NAME}." } stop() { echo -n "Stopping PHP FastCGI: " - killall -q -w -u $USER $PHP_CGI - RETVAL=$? - echo "$PHP_CGI_NAME." + killall -q -w -u "${USER} ${PHP_CGI}" + RETVAL="$?" + echo "${PHP_CGI_NAME}." } case "$1" in @@ -38,4 +38,4 @@ case "$1" in exit 1 ;; esac -exit $RETVAL +exit "$RETVAL"