Skip to content

Commit

Permalink
boot.sh now generates ENV entries for php-fpm.conf.
Browse files Browse the repository at this point in the history
  • Loading branch information
iphoting committed Sep 18, 2012
1 parent 312d108 commit 997e021
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
5 changes: 5 additions & 0 deletions bin/compile
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,11 @@ if [ -x "/app/local/bin/newrelic-license" ]; then
/app/local/bin/newrelic-license
fi
# Expose Heroku config vars to PHP-FPM processes
for var in \`env | cut -f1 -d=\`; do
echo "env[\$var] = \\$\${var}" >> /app/vendor/php/etc/php-fpm.conf
done
touch /app/vendor/nginx/logs/access.log /app/vendor/nginx/logs/error.log /app/vendor/php/var/log/php-fpm.log /app/local/var/log/newrelic/newrelic-daemon.log /app/local/var/log/newrelic/php_agent.log
mkdir -p client_body_temp fastcgi_temp proxy_temp scgi_temp uwsgi_temp
(tail -f -n 0 /app/vendor/nginx/logs/*.log /app/vendor/php/var/log/*.log /app/local/var/log/newrelic/*.log &)
Expand Down
7 changes: 0 additions & 7 deletions conf/php-fpm.conf
Original file line number Diff line number Diff line change
Expand Up @@ -468,13 +468,6 @@ ping.response = pong
env[TMP] = /tmp
env[TMPDIR] = /tmp
env[PATH] = $PATH
;env[SENDGRID_PASSWORD] = $SENDGRID_PASSWORD
;env[SENDGRID_USERNAME] = $SENDGRID_USERNAME
env[HEROKU] = $HEROKU
env[MYSQL_HOST] = $MYSQL_HOST
env[MYSQL_DB] = $MYSQL_DB
env[MYSQL_USER] = $MYSQL_USER
env[MYSQL_PASS] = $MYSQL_PASS

; Additional php.ini defines, specific to this pool of workers. These settings
; overwrite the values previously defined in the php.ini. The directives are the
Expand Down

0 comments on commit 997e021

Please sign in to comment.