Commit 5fc917c5 authored by Tails developers's avatar Tails developers
Browse files

vagrant: Add defaults for HTTP proxy build settings

If there is an HTTP proxy in the environment, we use it. If not, we switch
to the in-VM proxy. This can be overidden through TAILS_BUILD_OPTIONS.
parent f7652e56
......@@ -34,7 +34,12 @@ EXTERNAL_HTTP_PROXY = ENV['http_proxy']
VIRTUAL_MACHINE_HOSTNAME = 'squeeze.vagrantup.com'
task :parse_build_options do
options = ENV['TAILS_BUILD_OPTIONS'] || ''
options = ''
# Use in-VM proxy unless an external proxy is set
options += 'vmproxy ' unless EXTERNAL_HTTP_PROXY
options += ENV['TAILS_BUILD_OPTIONS'] if ENV['TAILS_BUILD_OPTIONS']
options.split(' ').each do |opt|
case opt
# HTTP proxy settings
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment