Skip to content

Commit 89c5d02

Browse files
committed
Merge branch 'php8dot2' of github.com:moveis-simonetti/php-apache-oci8-composer into php8dot2-mongodb
2 parents caf4c91 + 2a1cce3 commit 89c5d02

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

apache-run.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
#!/bin/bash
22

33
if [[ ${XDEBUG_ENABLED} == true ]]; then
4-
sudo xdebug-set-mode ${XDEBUG_MODE:-debug}
4+
sudo -E xdebug-set-mode ${XDEBUG_MODE:-debug}
55
fi
66

7-
if [[ ${NR_ENABLED} == true ]]; then
8-
sudo sed -i -e "s/"REPLACE_WITH_REAL_KEY"/${NR_LICENSE_KEY}/g" /usr/local/etc/php/conf.d/newrelic.ini
9-
sudo sed -i -e "s/PHP Application/${NR_APP_NAME}/g" /usr/local/etc/php/conf.d/newrelic.ini
10-
else
11-
echo "newrelic.enabled = false" | sudo tee -a /usr/local/etc/php/conf.d/newrelic.ini
12-
fi
7+
sudo -E newrelic-setup
138

149
if [[ ${SESSION_HANDLER} == true ]]; then
1510
echo "session.save_handler = ${SESSION_HANDLER_NAME}" | sudo tee -a /usr/local/etc/php/conf.d/session-handler.ini

bin/newrelic-setup

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
if [[ ${NR_ENABLED} == true ]]; then
4+
sed -i -e "s/"REPLACE_WITH_REAL_KEY"/${NR_LICENSE_KEY}/g" /usr/local/etc/php/conf.d/newrelic.ini
5+
sed -i -e "s/PHP Application/${NR_APP_NAME}/g" /usr/local/etc/php/conf.d/newrelic.ini
6+
echo "newrelic.enabled = true" | tee -a /usr/local/etc/php/conf.d/newrelic.ini
7+
else
8+
echo "newrelic.enabled = false" | tee -a /usr/local/etc/php/conf.d/newrelic.ini
9+
fi

0 commit comments

Comments
 (0)