diff --git a/package-configuration/centos-agent/centos-celeryd-cloudify.init.template b/package-configuration/centos-agent/centos-celeryd-cloudify.init.template index 638693a2..0f3ee5fc 100644 --- a/package-configuration/centos-agent/centos-celeryd-cloudify.init.template +++ b/package-configuration/centos-agent/centos-celeryd-cloudify.init.template @@ -18,11 +18,18 @@ # Short-Description: celery task worker daemon ### END INIT INFO +# Can be a runlevel symlink (e.g. S02celeryd) +if [ -L "$0" ]; then + SCRIPT_FILE=$(readlink "$0") +else + SCRIPT_FILE="$0" +fi +SCRIPT_NAME="$(basename "$SCRIPT_FILE")" + WORKER_MODIFIER="{{ worker_modifier }}" CELERY_BASE_DIR="{{ celery_base_dir }}" -ME=$(basename $0) export CELERY_WORK_DIR="${CELERY_BASE_DIR}/cloudify.${WORKER_MODIFIER}/work" -CELERY_DEFAULTS="/etc/default/${ME}" +CELERY_DEFAULTS="/etc/default/${SCRIPT_NAME}" # some commands work asyncronously, so we'll wait this many seconds SLEEP_SECONDS=5 diff --git a/package-configuration/debian-agent/debian-celeryd-cloudify.init.template b/package-configuration/debian-agent/debian-celeryd-cloudify.init.template index 638693a2..0f3ee5fc 100644 --- a/package-configuration/debian-agent/debian-celeryd-cloudify.init.template +++ b/package-configuration/debian-agent/debian-celeryd-cloudify.init.template @@ -18,11 +18,18 @@ # Short-Description: celery task worker daemon ### END INIT INFO +# Can be a runlevel symlink (e.g. S02celeryd) +if [ -L "$0" ]; then + SCRIPT_FILE=$(readlink "$0") +else + SCRIPT_FILE="$0" +fi +SCRIPT_NAME="$(basename "$SCRIPT_FILE")" + WORKER_MODIFIER="{{ worker_modifier }}" CELERY_BASE_DIR="{{ celery_base_dir }}" -ME=$(basename $0) export CELERY_WORK_DIR="${CELERY_BASE_DIR}/cloudify.${WORKER_MODIFIER}/work" -CELERY_DEFAULTS="/etc/default/${ME}" +CELERY_DEFAULTS="/etc/default/${SCRIPT_NAME}" # some commands work asyncronously, so we'll wait this many seconds SLEEP_SECONDS=5 diff --git a/package-configuration/ubuntu-agent/Ubuntu-celeryd-cloudify.init.template b/package-configuration/ubuntu-agent/Ubuntu-celeryd-cloudify.init.template index 638693a2..0f3ee5fc 100644 --- a/package-configuration/ubuntu-agent/Ubuntu-celeryd-cloudify.init.template +++ b/package-configuration/ubuntu-agent/Ubuntu-celeryd-cloudify.init.template @@ -18,11 +18,18 @@ # Short-Description: celery task worker daemon ### END INIT INFO +# Can be a runlevel symlink (e.g. S02celeryd) +if [ -L "$0" ]; then + SCRIPT_FILE=$(readlink "$0") +else + SCRIPT_FILE="$0" +fi +SCRIPT_NAME="$(basename "$SCRIPT_FILE")" + WORKER_MODIFIER="{{ worker_modifier }}" CELERY_BASE_DIR="{{ celery_base_dir }}" -ME=$(basename $0) export CELERY_WORK_DIR="${CELERY_BASE_DIR}/cloudify.${WORKER_MODIFIER}/work" -CELERY_DEFAULTS="/etc/default/${ME}" +CELERY_DEFAULTS="/etc/default/${SCRIPT_NAME}" # some commands work asyncronously, so we'll wait this many seconds SLEEP_SECONDS=5 diff --git a/package-configuration/ubuntu-commercial-agent/Ubuntu-celeryd-cloudify.init.template b/package-configuration/ubuntu-commercial-agent/Ubuntu-celeryd-cloudify.init.template index 638693a2..0f3ee5fc 100644 --- a/package-configuration/ubuntu-commercial-agent/Ubuntu-celeryd-cloudify.init.template +++ b/package-configuration/ubuntu-commercial-agent/Ubuntu-celeryd-cloudify.init.template @@ -18,11 +18,18 @@ # Short-Description: celery task worker daemon ### END INIT INFO +# Can be a runlevel symlink (e.g. S02celeryd) +if [ -L "$0" ]; then + SCRIPT_FILE=$(readlink "$0") +else + SCRIPT_FILE="$0" +fi +SCRIPT_NAME="$(basename "$SCRIPT_FILE")" + WORKER_MODIFIER="{{ worker_modifier }}" CELERY_BASE_DIR="{{ celery_base_dir }}" -ME=$(basename $0) export CELERY_WORK_DIR="${CELERY_BASE_DIR}/cloudify.${WORKER_MODIFIER}/work" -CELERY_DEFAULTS="/etc/default/${ME}" +CELERY_DEFAULTS="/etc/default/${SCRIPT_NAME}" # some commands work asyncronously, so we'll wait this many seconds SLEEP_SECONDS=5