From fc59647a4aa374c4958c3e76c69c7516b95821d2 Mon Sep 17 00:00:00 2001 From: Vishnu Ks Date: Fri, 15 Sep 2017 00:40:14 +0530 Subject: [PATCH] Vagrantfile: Provide a way to remove proxy from vagrant. Fixes #5292 --- Vagrantfile | 18 ++++++++++++------ docs/dev-env-first-time-contributors.md | 4 ++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index def1d6aab7..600a3fc6ea 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -26,7 +26,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # The Zulip development environment runs on 9991 on the guest. host_port = 9991 - http_proxy = https_proxy = no_proxy = "" + http_proxy = https_proxy = no_proxy = nil host_ip_addr = "127.0.0.1" config.vm.synced_folder ".", "/vagrant", disabled: true @@ -48,20 +48,26 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| end end - config.vm.network "forwarded_port", guest: 9991, host: host_port, host_ip: host_ip_addr - if Vagrant.has_plugin?("vagrant-proxyconf") - if http_proxy != "" + if !http_proxy.nil? config.proxy.http = http_proxy end - if https_proxy != "" + if !https_proxy.nil? config.proxy.https = https_proxy end - if https_proxy != "" + if !no_proxy.nil? config.proxy.no_proxy = no_proxy end + elsif !http_proxy.nil? or !https_proxy.nil? + # This prints twice due to https://github.com/hashicorp/vagrant/issues/7504 + # We haven't figured out a workaround. + 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 ' \ + 'vagrant-proxyconf` in a terminal. This error will appear twice.' + exit end + config.vm.network "forwarded_port", guest: 9991, host: host_port, host_ip: host_ip_addr # Specify LXC provider before VirtualBox provider so it's preferred. config.vm.provider "lxc" do |lxc| if command? "lxc-ls" diff --git a/docs/dev-env-first-time-contributors.md b/docs/dev-env-first-time-contributors.md index a30a8ba7a5..fcecb4e59b 100644 --- a/docs/dev-env-first-time-contributors.md +++ b/docs/dev-env-first-time-contributors.md @@ -982,6 +982,10 @@ Now run `vagrant up` in your terminal to install the development server. If you ran `vagrant up` before and failed, you'll need to run `vagrant destroy` first to clean up the failed installation. +**If you no longer want to use proxy with Vagrant, set values of HTTP_PROXY +and HTTPS_PROXY to `""` in `~/.zulip-vagrant-config` file and +restart Vagrant.** + You can also change the port on the host machine that Vagrant uses by adding to your `~/.zulip-vagrant-config` file. E.g. if you set: