Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Vagrantfile: Reformat with Rufo. 

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2021-03-24 10:31:13 -07:00 committed by Tim Abbott
parent 6ee74b3433
commit 81ffc4e827
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Vagrantfile vendored
View File

@ -7,13 +7,13 @@ def command?(name)
$?.success? $?.success?
end end
if Vagrant::VERSION == "1.8.7" then if Vagrant::VERSION == "1.8.7"
path = `which curl` path = `which curl`
if path.include?('/opt/vagrant/embedded/bin/curl') then if path.include?("/opt/vagrant/embedded/bin/curl")
puts "In Vagrant 1.8.7, curl is broken. Please use Vagrant 2.0.2 "\ puts "In Vagrant 1.8.7, curl is broken. Please use Vagrant 2.0.2 " \
"or run 'sudo rm -f /opt/vagrant/embedded/bin/curl' to fix the "\ "or run 'sudo rm -f /opt/vagrant/embedded/bin/curl' to fix the " \
"issue before provisioning. See "\ "issue before provisioning. See " \
"https://github.com/mitchellh/vagrant/issues/7997 "\ "https://github.com/mitchellh/vagrant/issues/7997 " \
"for reference." "for reference."
exit exit
end end
@ -26,7 +26,7 @@ end
# updating of boxes (since the old URL doesn't work). See # updating of boxes (since the old URL doesn't work). See
# https://github.com/hashicorp/vagrant/issues/9442 # https://github.com/hashicorp/vagrant/issues/9442
if Vagrant::DEFAULT_SERVER_URL == "atlas.hashicorp.com" if Vagrant::DEFAULT_SERVER_URL == "atlas.hashicorp.com"
Vagrant::DEFAULT_SERVER_URL.replace('https://vagrantcloud.com') Vagrant::DEFAULT_SERVER_URL.replace("https://vagrantcloud.com")
end end
# Monkey patch https://github.com/hashicorp/vagrant/pull/10879 so we # Monkey patch https://github.com/hashicorp/vagrant/pull/10879 so we
@ -36,7 +36,7 @@ begin
rescue LoadError rescue LoadError
else else
VagrantPlugins::DockerProvider::Provider.class_eval do VagrantPlugins::DockerProvider::Provider.class_eval do
method(:usable?).owner == singleton_class or def self.usable?(raise_error=false) method(:usable?).owner == singleton_class or def self.usable?(raise_error = false)
VagrantPlugins::DockerProvider::Driver.new.execute("docker", "version") VagrantPlugins::DockerProvider::Driver.new.execute("docker", "version")
true true
rescue Vagrant::Errors::CommandUnavailable, VagrantPlugins::DockerProvider::Errors::ExecuteError rescue Vagrant::Errors::CommandUnavailable, VagrantPlugins::DockerProvider::Errors::ExecuteError
@ -63,13 +63,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.synced_folder ".", "/vagrant", disabled: true config.vm.synced_folder ".", "/vagrant", disabled: true
config.vm.synced_folder ".", "/srv/zulip" config.vm.synced_folder ".", "/srv/zulip"
vagrant_config_file = ENV['HOME'] + "/.zulip-vagrant-config" vagrant_config_file = ENV["HOME"] + "/.zulip-vagrant-config"
if File.file?(vagrant_config_file) if File.file?(vagrant_config_file)
IO.foreach(vagrant_config_file) do |line| IO.foreach(vagrant_config_file) do |line|
line.chomp! line.chomp!
key, value = line.split(nil, 2) key, value = line.split(nil, 2)
case key case key
when /^([#;]|$)/; # ignore comments when /^([#;]|$)/ # ignore comments
when "HTTP_PROXY"; http_proxy = value when "HTTP_PROXY"; http_proxy = value
when "HTTPS_PROXY"; https_proxy = value when "HTTPS_PROXY"; https_proxy = value
when "NO_PROXY"; no_proxy = value when "NO_PROXY"; no_proxy = value
@ -96,9 +96,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
elsif !http_proxy.nil? or !https_proxy.nil? elsif !http_proxy.nil? or !https_proxy.nil?
# This prints twice due to https://github.com/hashicorp/vagrant/issues/7504 # This prints twice due to https://github.com/hashicorp/vagrant/issues/7504
# We haven't figured out a workaround. # We haven't figured out a workaround.
puts 'You have specified value for proxy in ~/.zulip-vagrant-config file but did not ' \ puts "You have specified value for proxy in ~/.zulip-vagrant-config file but did not " \
'install the vagrant-proxyconf plugin. To install it, run `vagrant plugin install ' \ "install the vagrant-proxyconf plugin. To install it, run `vagrant plugin install " \
'vagrant-proxyconf` in a terminal. This error will appear twice.' "vagrant-proxyconf` in a terminal. This error will appear twice."
exit exit
end end
@ -139,7 +139,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
prl.cpus = vm_num_cpus prl.cpus = vm_num_cpus
end end
$provision_script = <<SCRIPT $provision_script = <<SCRIPT
set -x set -x
set -e set -e
set -o pipefail set -o pipefail