aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Friedman <maf675@gmail.com>2016-03-20 09:43:23 -0700
committerMatt Friedman <maf675@gmail.com>2016-04-28 08:36:49 -0700
commit3cd0c53118b0e339c644d760bcb914998c455209 (patch)
tree6a341b4de474b053070613da872b4543f0a54148 /Vagrantfile
parent[ticket/14547] Add Vagrant to phpBB (diff)
downloadphpbb-3cd0c53118b0e339c644d760bcb914998c455209.tar.gz
phpbb-3cd0c53118b0e339c644d760bcb914998c455209.tar.bz2
phpbb-3cd0c53118b0e339c644d760bcb914998c455209.zip
[ticket/14547] Use package compatible with phpBB requirements
PHPBB3-14547
Diffstat (limited to 'Vagrantfile')
-rw-r--r--Vagrantfile3
1 files changed, 0 insertions, 3 deletions
diff --git a/Vagrantfile b/Vagrantfile
index d8ba9b3137..ab225c9ad9 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -5,7 +5,6 @@ VAGRANTFILE_API_VERSION ||= "2"
confDir = $confDir ||= File.expand_path("phpBB/vendor/laravel/homestead", File.dirname(__FILE__))
homesteadYamlPath = "vagrant/bootstrap.yaml"
-homesteadJsonPath = "vagrant/bootstrap.json"
afterScriptPath = "vagrant/after.sh"
aliasesPath = "vagrant/aliases"
@@ -18,8 +17,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
if File.exists? homesteadYamlPath then
Homestead.configure(config, YAML::load(File.read(homesteadYamlPath)))
- elsif File.exists? homesteadJsonPath then
- Homestead.configure(config, JSON.parse(File.read(homesteadJsonPath)))
end
if File.exists? afterScriptPath then