diff --git a/install/etc/cont-init.d/20-php-fpm b/install/etc/cont-init.d/20-php-fpm index b6024f1..582833e 100755 --- a/install/etc/cont-init.d/20-php-fpm +++ b/install/etc/cont-init.d/20-php-fpm @@ -43,7 +43,16 @@ if [ ! -f "/tmp/.container/container-restart" ] ; then phpfpm_configure_extensions if [[ "${PHP_FPM_CONTAINER_MODE,,}" == *"nginx"* ]] ; then phpfpm_configure_nginx ; fi if [[ "${PHP_FPM_CONTAINER_MODE,,}" == *"php-fpm"* ]] ; then phpfpm_create_default_page ; fi - if var_true "${NGINX_ENABLE_APPLICATION_CONFIGURATION}"; then phpfpm_configure_site_default ; fi + if var_true "${NGINX_ENABLE_APPLICATION_CONFIGURATION}"; then + if [ -n "${NGINX_WEBROOT_SUFFIX}" ]; then + _nginx_webroot_original="${NGINX_WEBROOT}" + NGINX_WEBROOT=${NGINX_WEBROOT}${NGINX_WEBROOT_SUFFIX} + fi + phpfpm_configure_site_default + if [ -n "${NGINX_WEBROOT_SUFFIX}" ]; then + NGINX_WEBROOT=${_nginx_webroot_original} + fi + fi if [ "${NGINX_AUTHENTICATION_TYPE,,}" = "llng" ] ; then phpfpm_configure_authentication ; fi phpfpm_configure_logging phpfpm_post_init