Merge branch 'master' into PHRAS-3391-change-delete-confirmation-window

This commit is contained in:
Nicolas Maillat
2021-03-30 22:33:55 +02:00
committed by GitHub

View File

@@ -44,7 +44,7 @@ if [[ $NEWRELIC_ENABLED = "true" ]]; then
echo "Newrelic setup of daemon and PHP agent done"
else
echo `date +"%Y-%m-%d %H:%M:%S"` " - Newrelic extension deactivation."
rm /usr/local/etc/php/conf.d/newrelic.ini
rm - f /usr/local/etc/php/conf.d/newrelic.ini
fi
if [[ $BLACKFIRE_ENABLED = "true" ]]; then
@@ -54,7 +54,7 @@ if [[ $BLACKFIRE_ENABLED = "true" ]]; then
echo "Blackfire setup done"
else
echo `date +"%Y-%m-%d %H:%M:%S"` " - blackfire extension deactivation."
rm /usr/local/etc/php/conf.d/zz-blackfire.ini
rm -f /usr/local/etc/php/conf.d/zz-blackfire.ini
fi
rm -rf bin/run-worker.sh