Add Proxy Support

CHANGELOG.md

@@ -9,7 +9,9 @@
    * make the `b2d-start.bat` and `b2d-stop.bat` scripts more resilient
    * add `b2d` shortcut doskey alias for `boot2docker`
    * add `GLOBAL_VAGRANT_CACHIER_DISABLED` env var to allow for disabling vagrant-cachier in the global Vagrantfile ([#98](https://github.com/tknerr/bills-kitchen/pull/98))
-   * patch vagrant with remote docker host support; conditionally enable it `b2d-start` and disable it in `b2d-stop` (experimental, see [#100](https://github.com/tknerr/bills-kitchen/pull/100git)) 
+   * patch vagrant with remote docker host support; conditionally enable it `b2d-start` and disable it in `b2d-stop` (experimental, see [#100](https://github.com/tknerr/bills-kitchen/pull/100git))
+   * add `proxy-on.bat` and `proxy-off.bat` convenience scripts for setting the proxy env vars (see [#102](https://github.com/tknerr/bills-kitchen/pull/102))
+   * add the [vagrant-proxyconf](https://github.com/tmatilai/vagrant-proxyconf) plugin for configuring the proxy inside vagrant VMs (see [#102](https://github.com/tknerr/bills-kitchen/pull/102))
  * bug fixes:
    * make `bundle` and other gem binaries work in `git-bash` too [#97](https://github.com/tknerr/bills-kitchen/issues/97)
 

README.md

@@ -39,6 +39,7 @@ These plugins are pre-installed:
    * [vagrant-cachier](https://github.com/fgrehm/vagrant-cachier) - caches all kinds of packages you intsall in the vagrant VMs
    * [vagrant-berkshelf](https://github.com/berkshelf/vagrant-berkshelf) - berkshelf integration for vagrant
    * [vagrant-toplevel-cookbooks](https://github.com/tknerr/vagrant-toplevel-cookbooks) - support for one top-level cookbook per vagrant VM
+   * [vagrant-proxyconf](https://github.com/tmatilai/vagrant-proxyconf) - for configuring a proxy inside the VMs
    * ...use `vagrant install <plugin>` to install more
  * knife plugins (just as an example):
    * [knife-audit](https://github.com/jbz/knife-audit) - keeps track of which cookbooks are used by which node

Rakefile

@@ -164,6 +164,7 @@ def install_vagrant_plugins
     && vagrant plugin install vagrant-toplevel-cookbooks --plugin-version 0.2.4 \
     && vagrant plugin install vagrant-omnibus --plugin-version 1.4.1 \
     && vagrant plugin install vagrant-cachier --plugin-version 1.2.0 \
+    && vagrant plugin install vagrant-proxyconf --plugin-version 1.5.0 \
     && vagrant plugin install vagrant-berkshelf --plugin-version 4.0.3"
     fail "vagrant plugin installation failed" unless system(command)
   end

files/set-env.bat

@@ -4,10 +4,10 @@
 :: # Setting up Environment...
 :: ########################################################
 
-set SCRIPT_DIR=%~dp0
-set BK_ROOT=%SCRIPT_DIR%
+set BK_ROOT=%~dp0
 
 :: for these we need the bin dirs in PATH
+set SCRIPTSDIR=%BK_ROOT%tools\scripts
 set DOCKERDIR=%BK_ROOT%tools\docker
 set DEVKITDIR=%BK_ROOT%tools\devkit
 set KDIFF3DIR=%BK_ROOT%tools\kdiff3
@@ -71,12 +71,6 @@ if "%GIT_CONF_EMAIL%"=="" (
 cmd /C %GITDIR%\cmd\git config --global --replace user.name "%GIT_CONF_USERNAME%"
 cmd /C %GITDIR%\cmd\git config --global --replace user.email "%GIT_CONF_EMAIL%"
 
-:: toggle proxy based on env var
-if "%HTTP_PROXY%"=="" (
-  cmd /C %GITDIR%\cmd\git config --global --unset http.proxy
-) else (
-  cmd /C %GITDIR%\cmd\git config --global --replace http.proxy %HTTP_PROXY%
-)
 
 :: don't let VirtualBox use %HOME% instead of %USERPROFILE%,
 :: otherwise it would become confused when W:\ is unmounted
@@ -103,6 +97,7 @@ set CYGWIN=nodosfilewarning
 :: show the environment
 echo BK_ROOT=%BK_ROOT%
 echo HOME=%HOME%
+echo SCRIPTSDIR=%SCRIPTSDIR%
 echo CHEFDKDIR=%CHEFDKDIR%
 echo CHEFDKHOMEDIR=%CHEFDKHOMEDIR%
 echo GEM_ROOT=%GEM_ROOT%
@@ -136,4 +131,4 @@ echo HTTP_PROXY=%HTTP_PROXY%
 @doskey be=bundle exec $*
 @doskey b2d=boot2docker $*
 
-set PATH=%DOCKERDIR%;%CHEFDK_PATH_ENTRIES%;%CONSULDIR%;%PACKERDIR%;%TERRAFORMDIR%;%VAGRANTDIR%\bin;%GITDIR%\cmd;%GITDIR%;%KDIFF3DIR%;%CWRSYNCDIR%;%VAGRANTDIR%\embedded\bin;%CONEMUDIR%;%ATOMDIR%;%APMDIR%;%PUTTYDIR%;%VBOX_MSI_INSTALL_PATH%;%VBOX_INSTALL_PATH%;%PATH%
+set PATH=%SCRIPTSDIR%;%DOCKERDIR%;%CHEFDK_PATH_ENTRIES%;%CONSULDIR%;%PACKERDIR%;%TERRAFORMDIR%;%VAGRANTDIR%\bin;%GITDIR%\cmd;%GITDIR%;%KDIFF3DIR%;%CWRSYNCDIR%;%VAGRANTDIR%\embedded\bin;%CONEMUDIR%;%ATOMDIR%;%APMDIR%;%PUTTYDIR%;%VBOX_MSI_INSTALL_PATH%;%VBOX_INSTALL_PATH%;%PATH%

files/set-env.ps1

@@ -1,7 +1,7 @@
 
-$script:pwd = Split-Path $MyInvocation.MyCommand.Path
-$env:BK_ROOT = $pwd
+$env:BK_ROOT = Split-Path $MyInvocation.MyCommand.Path
 
+$env:SCRIPTSDIR = Join-Path $env:BK_ROOT tools\scripts
 $env:DOCKERDIR = Join-Path $env:BK_ROOT tools\docker
 $env:DEVKITDIR = Join-Path $env:BK_ROOT tools\devkit
 $env:KDIFF3DIR = Join-Path $env:BK_ROOT tools\kdiff3
@@ -106,6 +106,7 @@ $env:SSL_CERT_FILE = Join-Path $env:HOME "cacert.pem"
 # show the environment
 Write-Host "BK_ROOT=$env:BK_ROOT"
 Write-Host "HOME=$env:HOME"
+Write-Host "SCRIPTSDIR=$env:SCRIPTSDIR"
 Write-Host "CHEFDKDIR=$env:CHEFDKDIR"
 Write-Host "RUBYDIR=$env:RUBYDIR"
 Write-Host "CHEFDKHOMEDIR=$env:CHEFDKHOMEDIR"
@@ -138,4 +139,4 @@ set-alias vi "atom.cmd";
 set-alias be "bundle exec";
 set-alias b2d "boot2docker";
 
-$env:Path = "$env:DOCKERDIR;$env:CHEFDK_PATH_ENTRIES;$env:CONSULDIR;$env:PACKERDIR;$env:TERRAFORMDIR;$env:VAGRANTDIR\bin;$env:KDIFF3DIR;$env:CWRSYNCDIR;$env:VAGRANTDIR\embedded\bin;$env:CONEMUDIR;$env:ATOMDIR;$env:APMDIR;$env:PUTTYDIR;$env:VBOX_INSTALL_PATH;$env:Path"
+$env:Path = "$env:SCRIPTSDIR;$env:DOCKERDIR;$env:CHEFDK_PATH_ENTRIES;$env:CONSULDIR;$env:PACKERDIR;$env:TERRAFORMDIR;$env:VAGRANTDIR\bin;$env:KDIFF3DIR;$env:CWRSYNCDIR;$env:VAGRANTDIR\embedded\bin;$env:CONEMUDIR;$env:ATOMDIR;$env:APMDIR;$env:PUTTYDIR;$env:VBOX_INSTALL_PATH;$env:Path"

files/tools/docker/b2d-start.bat → files/tools/scripts/b2d-start.bat

@@ -40,8 +40,17 @@ boot2docker up
 echo Mounting the shared folder inside the VM to %BK_ROOT_CYGPATH%
 boot2docker ssh -- sudo mount -t vboxsf billskitchen %BK_ROOT_CYGPATH%
 
-:: for proxies:
-:: see http://stackoverflow.com/a/29303930/2388971
+:: set / unset proxy in boot2docker VM
+:: for more on proxies, see http://stackoverflow.com/a/29303930/2388971
+if "%BK_USE_PROXY%" == "1" (
+  echo setting proxy in the boot2docker VM...
+  boot2docker ssh "echo 'export HTTP_PROXY=%HTTP_PROXY%; export HTTPS_PROXY=%HTTPS_PROXY%; export NO_PROXY=%NO_PROXY%;' | sudo tee /var/lib/boot2docker/profile"
+) else (
+  echo making sure no proxy is set in the boot2docker VM...
+  boot2docker ssh "sudo rm -rf /var/lib/boot2docker/profile"
+)
+boot2docker ssh "sudo /etc/init.d/docker restart > /dev/null"
+
 
 ENDLOCAL
 

files/tools/scripts/proxy-off.bat

@@ -0,0 +1,15 @@
+
+@echo off
+
+:: remove the indicator
+set BK_USE_PROXY=
+
+:: unset the proxy on the host system
+set HTTP_PROXY=
+set HTTPS_PROXY=
+set NO_PROXY=
+
+:: unset reusing the host proxy in vagrant VMs
+set VAGRANT_HTTP_PROXY=
+set VAGRANT_HTTPS_PROXY=
+set VAGRANT_NO_PROXY=

files/tools/scripts/proxy-on.bat

@@ -0,0 +1,22 @@
+
+@echo off
+
+:: indicate that a proxy should be used
+set BK_USE_PROXY=1
+
+:: set the proxy on the host system
+set HTTP_PROXY=http://[your.proxy]:[port]
+set HTTPS_PROXY=https://[your.proxy]:[port]
+set NO_PROXY=localhost,127.0.0.1,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
+
+:: reuse the host proxy in vagrant VMs
+set VAGRANT_HTTP_PROXY=%HTTP_PROXY%
+set VAGRANT_HTTPS_PROXY=%HTTPS_PROXY%
+set VAGRANT_NO_PROXY=%NO_PROXY%
+
+
+:: better check :-)
+if "%HTTP_PROXY%" == "http://[your.proxy]:[port]" (
+  echo oops - did you forget to configure the proxy in %~df0?
+  exit /b 1
+)

spec/integration/bills_kitchen_spec.rb

@@ -147,6 +147,9 @@
       it "has 'vagrant-cachier (1.2.0)' plugin installed" do
         vagrant_plugin_installed "vagrant-cachier", "1.2.0"
       end
+      it "has 'vagrant-proxyconf (1.5.0)' plugin installed" do
+        vagrant_plugin_installed "vagrant-proxyconf", "1.5.0"
+      end
       it "has 'vagrant-berkshelf (4.0.3)' plugin installed" do
         vagrant_plugin_installed "vagrant-berkshelf", "4.0.3"
       end