Merge branch 'release/0.9.4'

Author: mstrazds

Changelog.md

@@ -1,3 +1,8 @@
+## 0.9.4 (release date: 2016-01-11)
+
+ * Bugfix for removing multiple newrelic instances
+ * Bugfix for newrelic install fails gracefully
+
 ## 0.9.3 (release date: 2016-01-10)
 
  * Removed latest version of nodejs installation

README.md

@@ -13,6 +13,7 @@ All services are defined and managed using the phusion/baseimage methodology. Lo
 * Nginx
 * PHP-FPM (5.6)
 * NTPD
+* New Relic APM
 
 ### Default Settings
 The container sets up a www root folder in the following location:

build/newrelic.sh

@@ -1,8 +1,13 @@
 #!/usr/bin/env bash
-set -e
+
+# Fail on error
+#set -e
 
 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
+
+# Remove extra new relic config file (causes log spamming)
+rm /etc/php5/cli/conf.d/newrelic.ini