diff --git a/bin/compile b/bin/compile index cb112a2f..558ca97c 100755 --- a/bin/compile +++ b/bin/compile @@ -483,6 +483,11 @@ if [ -f "/app/vendor/php/etc/conf.d/newrelic.ini" ] ; then fi fi +if [ -f "/app/conf/nginx.conf.erb" ] ; then + export HAS_SERVER_CONF=true + erb /app/conf/servers.conf.erb > /app/conf/servers.conf +fi + erb conf/nginx.conf.erb > /app/vendor/nginx/conf/nginx.conf erb conf/site.conf.erb > /app/vendor/nginx/conf/site.conf diff --git a/lib/composer b/lib/composer index e97a9419..9cc7ead7 100644 --- a/lib/composer +++ b/lib/composer @@ -163,7 +163,7 @@ function is_embedded_extension() { [ ${rc} -ne 0 ] && \ error "error while trying to identify if ${extension_name} is embedded in runtime: ${php_modules} (${rc})." - if echo "${php_modules}" | grep --quiet --ignore-case "${extension_name}" ; then + if echo "${php_modules}" | grep --quiet --extended-regexp --ignore-case "^${extension_name}$" ; then echo "true" else echo "false"