From f99cd2f308f68e2d971e4b2553f2688026074075 Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 24 Jan 2020 23:51:41 +1100 Subject: [PATCH] Added FORCE_PERMS --- init | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/init b/init index 9446482..76ad0b7 100755 --- a/init +++ b/init @@ -19,9 +19,12 @@ if [ "${role}" = "app" -a -e artisan ]; then exec /bin/bash fi + mountpoint -q ${php} + mp=$? + # Only adjust perms if this is an external mountpoint - if mountpoint -q ${php}; then - if [ "${env}" != "dev" -a -z "${SKIP_PERM}" ]; then + if [ ${mp} -eq 0 -o -n "${FORCE_PERMS}" ] ; then + if [ -n "${FORCE_PERMS}" -o "${env}" != "dev" -a -z "${SKIP_PERM}" ]; then echo "* Setting Permissions..." # Make sure our permissions are appropraite find ${php} -type f -exec chmod 640 {} \; @@ -42,14 +45,17 @@ if [ "${role}" = "app" -a -e artisan ]; then NODEV="--no-dev" fi - if mountpoint -q ${composer}; then - [ "${env}" != "dev" -a -z "${SKIP_PERM}" ] && chown -R www-data:www-data ${composer} + mountpoint -q ${composer} + mp=$? + + 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} [ ! -d ${php}/vendor ] && mkdir -m 750 ${php}/vendor && chown www-data:www-data ${php}/vendor - [ "${env}" != "dev" -a -z "${SKIP_PERM}" ] && chmod g+w ${php} + [ -n "${FORCE_PERMS}" -o "${env}" != "dev" -a -z "${SKIP_PERM}" ] && chmod g+w ${php} fi su www-data -s /bin/sh -c "composer install --optimize-autoloader ${NODEV}" && ( test -e .composer.refresh && rm -f .composer.refresh ) - [ "${env}" != "dev" -a -z "${SKIP_PERM}" ] && mountpoint -q ${composer} && chmod g-w ${php} + [ -n "${FORCE_PERMS}" -o "${env}" != "dev" -a -z "${SKIP_PERM}" ] && [ ${mp} -eq 0 ] && chmod g-w ${php} fi if [ -r .migrate ]; then