Merge branch 'release/0.9.7'

Author: mstrazds

build/newrelic.sh

@@ -3,11 +3,16 @@
 # Fail on error
 #set -e
 
-echo "Enabling APM metrics for ${NR_APP_NAME}"
-newrelic-install install
+if [ "$NR_INSTALL_KEY" = "**ChangeMe**" ]; then
+    echo "Skipping New Relic Setup..."
+else
+    echo "New Relic NR_INSTALL_KEY detected..."
+    echo "Enabling APM metrics for ${NR_APP_NAME}"
+    newrelic-install install
 
-# Update the application name
-sed -i "s/newrelic.appname = \"PHP Application\"/newrelic.appname = \"${NR_APP_NAME}\"/" /etc/php5/fpm/conf.d/newrelic.ini
+    # Update the application name
+    sed -i "s/newrelic.appname = \"PHP Application\"/newrelic.appname = \"${NR_APP_NAME}\"/" /etc/php5/fpm/conf.d/newrelic.ini
 
-# Remove extra new relic config file (causes log spamming)
-rm /etc/php5/cli/conf.d/newrelic.ini
+    # Remove extra new relic config file (causes log spamming)
+    rm /etc/php5/cli/conf.d/newrelic.ini
+fi