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

Commit 400ee40

Browse files
committed
Merge branch 'release/1.0.3'
2 parents 3385d8a + dfc8fa2 commit 400ee40

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
@@ -91,7 +91,8 @@ Vagrant.configure("2") do |config|
9191
VAGRANT_GID: box_config.get(:gid).to_s,
9292
VAGRANT_USER: box_config.get(:user),
9393
VAGRANT_GROUP: box_config.get(:group),
94-
VAGRANT_HOSTNAME: box_config.get(:hostname)
94+
VAGRANT_HOSTNAME: box_config.get(:hostname),
95+
VAGRANT_FPM_SERVICE: box_config.flag?(:php7) ? 'php7.0-fpm' : 'php5-fpm'
9596
}
9697
end
9798

vagrant/provisioning/nfs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ set -e
44

55
echo "Changing user id"
66
service nginx stop
7-
service php5-fpm stop
7+
service ${VAGRANT_FPM_SERVICE} stop
88
service hhvm stop
99
usermod -u ${VAGRANT_UID} ${VAGRANT_USER}
1010
service nginx start
11-
service php5-fpm start
11+
service ${VAGRANT_FPM_SERVICE} start
1212
service hhvm start

0 commit comments

Comments
 (0)