Skip to content

Commit

Permalink
❄️ Require Vagrant >= 2.1.0, Base box > 6.0.0, Remove Z-Ray overrides
Browse files Browse the repository at this point in the history
  • Loading branch information
svpernova09 committed Jun 3, 2018
1 parent 0d9b708 commit 1545bdd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 1 addition & 9 deletions scripts/homestead.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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|

Expand Down

0 comments on commit 1545bdd

Please sign in to comment.