Changed dev to local, since laravel uses local for non-production deployments
This commit is contained in:
parent
3868365626
commit
8d34685aaa
12
init
12
init
@ -46,7 +46,7 @@ if [ "${role}" = "app" -a -e artisan ]; then
|
|||||||
|
|
||||||
# Only adjust perms if this is an external mountpoint
|
# Only adjust perms if this is an external mountpoint
|
||||||
if [ ${mp} -eq 0 -o -n "${FORCE_PERMS}" ] ; then
|
if [ ${mp} -eq 0 -o -n "${FORCE_PERMS}" ] ; then
|
||||||
if [ -n "${FORCE_PERMS}" -o "${env}" != "dev" -a -z "${SKIP_PERM}" ]; then
|
if [ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ]; then
|
||||||
echo "* Setting Permissions..."
|
echo "* Setting Permissions..."
|
||||||
# Make sure our permissions are appropraite
|
# Make sure our permissions are appropraite
|
||||||
find ${php} -type f -exec chmod 640 {} \;
|
find ${php} -type f -exec chmod 640 {} \;
|
||||||
@ -63,20 +63,20 @@ if [ "${role}" = "app" -a -e artisan ]; then
|
|||||||
# See if we need to refresh our dependancies
|
# See if we need to refresh our dependancies
|
||||||
if [[ -r composer.json && ( -e .composer.refresh || ! -d vendor ) ]]; then
|
if [[ -r composer.json && ( -e .composer.refresh || ! -d vendor ) ]]; then
|
||||||
rm -f ${php}/bootstrap/cache/*.php
|
rm -f ${php}/bootstrap/cache/*.php
|
||||||
if [ "${env}" != "dev" ]; then
|
if [ "${env}" != "local" ]; then
|
||||||
NODEV="--no-dev"
|
NODEV="--no-dev"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mp=$(mp ${composer})
|
mp=$(mp ${composer})
|
||||||
|
|
||||||
if [ ${mp} -eq 0 -o -n "${FORCE_PERMS}" ] ; then
|
if [ ${mp} -eq 0 -o -n "${FORCE_PERMS}" ] ; then
|
||||||
[ -n "${FORCE_PERMS}" -o "${env}" != "dev" -a -z "${SKIP_PERM}" ] && chown -R www-data:www-data ${composer}
|
[ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && chown -R www-data:www-data ${composer}
|
||||||
[ ! -d ${php}/vendor ] && mkdir -m 750 ${php}/vendor && chown www-data:www-data ${php}/vendor
|
[ ! -d ${php}/vendor ] && mkdir -m 750 ${php}/vendor && chown www-data:www-data ${php}/vendor
|
||||||
[ -n "${FORCE_PERMS}" -o "${env}" != "dev" -a -z "${SKIP_PERM}" ] && chmod g+w ${php}
|
[ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && chmod g+w ${php}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
su www-data -s /bin/sh -c "composer install --optimize-autoloader ${NODEV}" && ( test -e .composer.refresh && rm -f .composer.refresh )
|
su www-data -s /bin/sh -c "composer install --optimize-autoloader ${NODEV}" && ( test -e .composer.refresh && rm -f .composer.refresh )
|
||||||
[ -n "${FORCE_PERMS}" -o "${env}" != "dev" -a -z "${SKIP_PERM}" ] && [ ${mp} -eq 0 ] && chmod g-w ${php}
|
[ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && [ ${mp} -eq 0 ] && chmod g-w ${php}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -e .lumen ]; then
|
if [ -e .lumen ]; then
|
||||||
@ -126,7 +126,7 @@ elif [ "$role" = "queue" -a -e artisan ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
QUEUE_CMD=work
|
QUEUE_CMD=work
|
||||||
if [ "${env}" == "dev" ]; then
|
if [ "${env}" == "local" ]; then
|
||||||
QUEUE_CMD=listen
|
QUEUE_CMD=listen
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user