diff --git a/Vagrantfile b/Vagrantfile index 9c8bca6ba..b905d57b1 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -14,7 +14,7 @@ aliasesPath = confDir + "/aliases" require File.expand_path(File.dirname(__FILE__) + '/scripts/homestead.rb') -Vagrant.require_version '>= 1.9.0' +Vagrant.require_version '>= 2.1.0' Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| if File.exist? aliasesPath then diff --git a/scripts/homestead.rb b/scripts/homestead.rb index 20deec8f4..779599942 100644 --- a/scripts/homestead.rb +++ b/scripts/homestead.rb @@ -12,7 +12,7 @@ def Homestead.configure(config, settings) # Configure The Box config.vm.define settings["name"] ||= "homestead-7" config.vm.box = settings["box"] ||= "laravel/homestead" - config.vm.box_version = settings["version"] ||= ">= 5.2.0" + config.vm.box_version = settings["version"] ||= ">= 6.0.0" config.vm.hostname = settings["hostname"] ||= "homestead" # Configure A Private Network IP @@ -185,14 +185,6 @@ def Homestead.configure(config, settings) s.path = scriptDir + "/clear-nginx.sh" end - # Temporary fix to disable Z-Ray by default to be fixed in future base box update - config.vm.provision "shell" do |s| - s.inline = "rm -rf /usr/lib/php/20170718/zray.so" - end - config.vm.provision "shell" do |s| - s.inline = "rm -rf /etc/php/7.2/fpm/conf.d/zray.ini" - end - if settings.include? 'sites' settings["sites"].each do |site|