Skip to content

php_frameworks
php_frameworks
Commit 4c8d96af authored by Yoshiharu Hirose's avatar Yoshiharu Hirose
Browse files
Options

no_proxyや小文字の環境変数による設定時も取り込むよう修正

parent dc56d906
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 40 deletions
cakephp3/Vagrantfile
View file @ 4c8d96af
......@@ -71,13 +71,16 @@ Vagrant.configure(2) do |config|
config.vm.box = "puppetlabs/centos-6.6-64-puppet"
if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
if ENV["HTTP_PROXY"] || ENV["HTTPS_PROXY"] || ENV["http_proxy"] || ENV["https_proxy"]
unless Vagrant.has_plugin?("vagrant-proxyconf")
raise 'vagrant-proxyconf plugin required.'
raise "vagrant-proxyconf plugin required."
end
config.proxy.http = ENV["HTTP_PROXY"] || ENV["http_proxy"]
config.proxy.https = ENV["HTTPS_PROXY"] || ENV["https_proxy"]
config.proxy.no_proxy = "localhost,127.0.0.1"
if ENV["NO_PROXY"] || ENV["no_proxy"]
config.proxy.no_proxy += "," + (ENV["NO_PROXY"] || ENV["no_proxy"])
end
config.proxy.http = ENV['HTTP_PROXY']
config.proxy.https = ENV['HTTPS_PROXY']
config.proxy.no_proxy = "localhost,127.0.0.1,.yso.marino.co.jp"
end
config.vm.hostname = "www"
......
codeigniter3/Vagrantfile
View file @ 4c8d96af
......@@ -71,13 +71,16 @@ Vagrant.configure(2) do |config|
config.vm.box = "puppetlabs/centos-6.6-64-puppet"
if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
if ENV["HTTP_PROXY"] || ENV["HTTPS_PROXY"] || ENV["http_proxy"] || ENV["https_proxy"]
unless Vagrant.has_plugin?("vagrant-proxyconf")
raise 'vagrant-proxyconf plugin required.'
raise "vagrant-proxyconf plugin required."
end
config.proxy.http = ENV["HTTP_PROXY"] || ENV["http_proxy"]
config.proxy.https = ENV["HTTPS_PROXY"] || ENV["https_proxy"]
config.proxy.no_proxy = "localhost,127.0.0.1"
if ENV["NO_PROXY"] || ENV["no_proxy"]
config.proxy.no_proxy += "," + (ENV["NO_PROXY"] || ENV["no_proxy"])
end
config.proxy.http = ENV['HTTP_PROXY']
config.proxy.https = ENV['HTTPS_PROXY']
config.proxy.no_proxy = "localhost,127.0.0.1,.yso.marino.co.jp"
end
config.vm.hostname = "www"
......
curry/Vagrantfile
View file @ 4c8d96af
......@@ -71,13 +71,16 @@ Vagrant.configure(2) do |config|
config.vm.box = "puppetlabs/centos-6.6-64-puppet"
if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
if ENV["HTTP_PROXY"] || ENV["HTTPS_PROXY"] || ENV["http_proxy"] || ENV["https_proxy"]
unless Vagrant.has_plugin?("vagrant-proxyconf")
raise 'vagrant-proxyconf plugin required.'
raise "vagrant-proxyconf plugin required."
end
config.proxy.http = ENV["HTTP_PROXY"] || ENV["http_proxy"]
config.proxy.https = ENV["HTTPS_PROXY"] || ENV["https_proxy"]
config.proxy.no_proxy = "localhost,127.0.0.1"
if ENV["NO_PROXY"] || ENV["no_proxy"]
config.proxy.no_proxy += "," + (ENV["NO_PROXY"] || ENV["no_proxy"])
end
config.proxy.http = ENV['HTTP_PROXY']
config.proxy.https = ENV['HTTPS_PROXY']
config.proxy.no_proxy = "localhost,127.0.0.1,.yso.marino.co.jp"
end
config.vm.hostname = "www"
......
fuelphp/Vagrantfile
View file @ 4c8d96af
......@@ -71,13 +71,16 @@ Vagrant.configure(2) do |config|
config.vm.box = "puppetlabs/centos-6.6-64-puppet"
if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
if ENV["HTTP_PROXY"] || ENV["HTTPS_PROXY"] || ENV["http_proxy"] || ENV["https_proxy"]
unless Vagrant.has_plugin?("vagrant-proxyconf")
raise 'vagrant-proxyconf plugin required.'
raise "vagrant-proxyconf plugin required."
end
config.proxy.http = ENV["HTTP_PROXY"] || ENV["http_proxy"]
config.proxy.https = ENV["HTTPS_PROXY"] || ENV["https_proxy"]
config.proxy.no_proxy = "localhost,127.0.0.1"
if ENV["NO_PROXY"] || ENV["no_proxy"]
config.proxy.no_proxy += "," + (ENV["NO_PROXY"] || ENV["no_proxy"])
end
config.proxy.http = ENV['HTTP_PROXY']
config.proxy.https = ENV['HTTPS_PROXY']
config.proxy.no_proxy = "localhost,127.0.0.1,.yso.marino.co.jp"
end
config.vm.hostname = "www"
......
laravel4/Vagrantfile
View file @ 4c8d96af
......@@ -71,13 +71,16 @@ Vagrant.configure(2) do |config|
config.vm.box = "puppetlabs/centos-6.6-64-puppet"
if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
if ENV["HTTP_PROXY"] || ENV["HTTPS_PROXY"] || ENV["http_proxy"] || ENV["https_proxy"]
unless Vagrant.has_plugin?("vagrant-proxyconf")
raise 'vagrant-proxyconf plugin required.'
raise "vagrant-proxyconf plugin required."
end
config.proxy.http = ENV["HTTP_PROXY"] || ENV["http_proxy"]
config.proxy.https = ENV["HTTPS_PROXY"] || ENV["https_proxy"]
config.proxy.no_proxy = "localhost,127.0.0.1"
if ENV["NO_PROXY"] || ENV["no_proxy"]
config.proxy.no_proxy += "," + (ENV["NO_PROXY"] || ENV["no_proxy"])
end
config.proxy.http = ENV['HTTP_PROXY']
config.proxy.https = ENV['HTTPS_PROXY']
config.proxy.no_proxy = "localhost,127.0.0.1,.yso.marino.co.jp"
end
config.vm.hostname = "www"
......
none/Vagrantfile
View file @ 4c8d96af
......@@ -71,13 +71,16 @@ Vagrant.configure(2) do |config|
config.vm.box = "puppetlabs/centos-6.6-64-puppet"
if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
if ENV["HTTP_PROXY"] || ENV["HTTPS_PROXY"] || ENV["http_proxy"] || ENV["https_proxy"]
unless Vagrant.has_plugin?("vagrant-proxyconf")
raise 'vagrant-proxyconf plugin required.'
raise "vagrant-proxyconf plugin required."
end
config.proxy.http = ENV["HTTP_PROXY"] || ENV["http_proxy"]
config.proxy.https = ENV["HTTPS_PROXY"] || ENV["https_proxy"]
config.proxy.no_proxy = "localhost,127.0.0.1"
if ENV["NO_PROXY"] || ENV["no_proxy"]
config.proxy.no_proxy += "," + (ENV["NO_PROXY"] || ENV["no_proxy"])
end
config.proxy.http = ENV['HTTP_PROXY']
config.proxy.https = ENV['HTTPS_PROXY']
config.proxy.no_proxy = "localhost,127.0.0.1,.yso.marino.co.jp"
end
config.vm.hostname = "www"
......
silex2/Vagrantfile
View file @ 4c8d96af
......@@ -71,13 +71,16 @@ Vagrant.configure(2) do |config|
config.vm.box = "puppetlabs/centos-6.6-64-puppet"
if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
if ENV["HTTP_PROXY"] || ENV["HTTPS_PROXY"] || ENV["http_proxy"] || ENV["https_proxy"]
unless Vagrant.has_plugin?("vagrant-proxyconf")
raise 'vagrant-proxyconf plugin required.'
raise "vagrant-proxyconf plugin required."
end
config.proxy.http = ENV["HTTP_PROXY"] || ENV["http_proxy"]
config.proxy.https = ENV["HTTPS_PROXY"] || ENV["https_proxy"]
config.proxy.no_proxy = "localhost,127.0.0.1"
if ENV["NO_PROXY"] || ENV["no_proxy"]
config.proxy.no_proxy += "," + (ENV["NO_PROXY"] || ENV["no_proxy"])
end
config.proxy.http = ENV['HTTP_PROXY']
config.proxy.https = ENV['HTTPS_PROXY']
config.proxy.no_proxy = "localhost,127.0.0.1,.yso.marino.co.jp"
end
config.vm.hostname = "www"
......
symfony2/Vagrantfile
View file @ 4c8d96af
......@@ -71,13 +71,16 @@ Vagrant.configure(2) do |config|
config.vm.box = "puppetlabs/centos-6.6-64-puppet"
if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
if ENV["HTTP_PROXY"] || ENV["HTTPS_PROXY"] || ENV["http_proxy"] || ENV["https_proxy"]
unless Vagrant.has_plugin?("vagrant-proxyconf")
raise 'vagrant-proxyconf plugin required.'
raise "vagrant-proxyconf plugin required."
end
config.proxy.http = ENV["HTTP_PROXY"] || ENV["http_proxy"]
config.proxy.https = ENV["HTTPS_PROXY"] || ENV["https_proxy"]
config.proxy.no_proxy = "localhost,127.0.0.1"
if ENV["NO_PROXY"] || ENV["no_proxy"]
config.proxy.no_proxy += "," + (ENV["NO_PROXY"] || ENV["no_proxy"])
end
config.proxy.http = ENV['HTTP_PROXY']
config.proxy.https = ENV['HTTPS_PROXY']
config.proxy.no_proxy = "localhost,127.0.0.1,.yso.marino.co.jp"
end
config.vm.hostname = "www"
......
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