Skip to content
This repository was archived by the owner on Feb 10, 2025. It is now read-only.

Commit fe383a5

Browse files
committed
Fix profiler 7.0
1 parent cc198ae commit fe383a5

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Vagrantfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ Vagrant.configure("2") do |config|
9292
VAGRANT_USER: box_config.get(:user),
9393
VAGRANT_GROUP: box_config.get(:group),
9494
VAGRANT_HOSTNAME: box_config.get(:hostname),
95-
VAGRANT_FPM_SERVICE: box_config.flag?(:php7) ? 'php7.0-fpm' : 'php5-fpm'
95+
VAGRANT_FPM_SERVICE: box_config.flag?(:php7) ? 'php7.0-fpm' : 'php5-fpm',
96+
VAGRNAT_PHP_ETC_DIR: box_config.flag?(:php7) ? '/etc/php/7.0/' : '/etc/php5/'
9697
}
9798
end
9899

vagrant/provisioning/profiler.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ if (!empty($_SERVER['PHP_PROFILE']) || !empty($_COOKIE['PHP_PROFILE'])) {
3636
}
3737
PHPFILE1
3838

39-
tee /etc/php5/fpm/conf.d/tideways.ini <<PHPINI
39+
tee ${VAGRNAT_PHP_ETC_DIR}/fpm/conf.d/tideways.ini <<PHPINI
4040
extension=tideways.so
4141
auto_prepend_file=$HOME_DIR/xhprof/prepend.php
4242
tideways.auto_prepend_library=0
4343
PHPINI
4444

45-
cp /etc/php5/fpm/conf.d/tideways.ini /etc/php5/cli/conf.d/tideways.ini
45+
cp ${VAGRNAT_PHP_ETC_DIR}/fpm/conf.d/tideways.ini ${VAGRNAT_PHP_ETC_DIR}/cli/conf.d/tideways.ini
4646

4747
if [ ! -L /data/web/staging ]
4848
then

0 commit comments

Comments
 (0)