From d2763ab2a97362d506c6dea645a6766e80139ee6 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Mon, 24 Feb 2020 14:55:48 -0500 Subject: [PATCH 01/13] incorporate powershell download with proxy into _download.cmd --- floppy/01-install-wget.cmd | 12 ------------ floppy/_download.cmd | 17 ++++++++++++++++- floppy/bitvisessh.bat | 3 --- floppy/cygwin.bat | 3 --- floppy/hotfix-KB2842230.bat | 3 --- floppy/openssh.bat | 3 --- floppy/upgrade-wua.bat | 3 --- script/01-install-handle.cmd | 3 --- script/cmtool.bat | 11 +++-------- script/sdelete.bat | 3 --- script/ultradefrag.bat | 6 ------ script/vagrant.bat | 3 --- 12 files changed, 19 insertions(+), 51 deletions(-) diff --git a/floppy/01-install-wget.cmd b/floppy/01-install-wget.cmd index 4087ed2a..6a45ab4a 100644 --- a/floppy/01-install-wget.cmd +++ b/floppy/01-install-wget.cmd @@ -10,24 +10,12 @@ if not defined WGET_URL set WGET_URL=https://eternallybored.org/misc/wget/curren for %%i in ("%WGET_URL%") do set filename=%SystemRoot%\%%~nxi -if not exist "%~dp0\_download.cmd" goto _download_cmd_not_found - copy /y "%~dp0\_download.cmd" "%SystemRoot%\" call "%~dp0\_download.cmd" "%WGET_URL%" "%filename%" if exist "%filename%" goto exit0 -:_download_cmd_not_found - -echo ==^> Downloading "%WGET_URL%" to "%filename%" - -:powershell - -powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%WGET_URL%', '%filename%')" Downloading "%url%" to "%filename%" + +if defined http_proxy ( + if defined no_proxy ( + set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.proxy.BypassList = (('%no_proxy%').split(',')) ; $wc.DownloadFile('%url%', '%filename%')" + ) else ( + set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.DownloadFile('%url%', '%filename%')" + ) +) else ( + set ps1_script="(New-Object System.Net.WebClient).DownloadFile('%url%', '%filename%')" +) -powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%url%', '%filename%')" nul if not errorlevel 1 if exist "%filename%" goto exit0 +if defined DISABLE_BITS ( + if "%DISABLE_BITS%" == "1" if not exist "%filename%" goto exit1 +) + :bitsadmin if defined DISABLE_BITS ( diff --git a/floppy/bitvisessh.bat b/floppy/bitvisessh.bat index 5b54a246..b0b0bef0 100644 --- a/floppy/bitvisessh.bat +++ b/floppy/bitvisessh.bat @@ -17,9 +17,6 @@ pushd "%BITVISE_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%BITVISE_URL%" "%BITVISE_PATH%" -) else ( - echo ==^> Downloading "%BITVISE_URL%" to "%BITVISE_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%BITVISE_URL%', '%BITVISE_PATH%')" Downloading "%CYGWIN_URL%" to "%CYGWIN_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%CYGWIN_URL%', '%CYGWIN_PATH%')" Downloading "%HOTFIX_2842230_URL%" to "%HOTFIX_2842230_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%HOTFIX_2842230_URL%', '%HOTFIX_2842230_PATH%')" Downloading "%OPENSSH_URL%" to "%OPENSSH_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%OPENSSH_URL%', '%OPENSSH_PATH%')" Downloading "%WUA_URL%" to "%WUA_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%WUA_URL%', '%WUA_PATH%')" Downloading "%HANDLE_URL%" to "%HANDLE_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%HANDLE_URL%', '%HANDLE_PATH%')" Downloading %CHEF_URL% to %CHEF_PATH% - powershell -Command "(New-Object System.Net.WebClient).DownloadFile(\"%CHEF_URL%\", '%CHEF_PATH%')" Downloading %PUPPET_URL% to %PUPPET_PATH% - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%PUPPET_URL%', '%PUPPET_PATH%')" Downloading %SALT_URL% to %SALT_DOWNLOAD% -powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SALT_URL%', '%SALT_DOWNLOAD%')" Patching bootstrap-salt.ps1 at %SALT_DOWNLOAD% diff --git a/script/sdelete.bat b/script/sdelete.bat index 26dc7e21..6943ea6c 100644 --- a/script/sdelete.bat +++ b/script/sdelete.bat @@ -14,9 +14,6 @@ pushd "%SDELETE_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%SDELETE_URL%" "%SDELETE_PATH%" -) else ( - echo ==^> Downloading "%SDELETE_URL%" to "%SDELETE_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SDELETE_URL%', '%SDELETE_PATH%')" Downloading "%SEVENZIP_URL%" to "%SEVENZIP_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SEVENZIP_URL%', '%SEVENZIP_PATH%')" Downloading "%ULTRADEFRAG_URL%" to "%ULTRADEFRAG_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%ULTRADEFRAG_URL%', '%ULTRADEFRAG_PATH%')" Downloading "%VAGRANT_PUB_URL%" to "%VAGRANT_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%VAGRANT_PUB_URL%', '%VAGRANT_PATH%')" Date: Mon, 24 Feb 2020 15:12:02 -0500 Subject: [PATCH 02/13] add proxy env vars to provisioners --- eval-win10x64-enterprise-cygwin.json | 5 ++++- eval-win10x64-enterprise-ssh.json | 5 ++++- eval-win10x64-enterprise.json | 5 ++++- eval-win10x86-enterprise-cygwin.json | 5 ++++- eval-win10x86-enterprise-ssh.json | 5 ++++- eval-win10x86-enterprise.json | 5 ++++- eval-win2008r2-datacenter-cygwin.json | 5 ++++- eval-win2008r2-datacenter-ssh.json | 5 ++++- eval-win2008r2-datacenter.json | 5 ++++- eval-win2008r2-standard-cygwin.json | 5 ++++- eval-win2008r2-standard-ssh.json | 5 ++++- eval-win2008r2-standard.json | 5 ++++- eval-win2012r2-datacenter-cygwin.json | 5 ++++- eval-win2012r2-datacenter-ssh.json | 5 ++++- eval-win2012r2-datacenter.json | 5 ++++- eval-win2012r2-standard-cygwin.json | 5 ++++- eval-win2012r2-standard-ssh.json | 5 ++++- eval-win2012r2-standard.json | 5 ++++- eval-win2016-standard-cygwin.json | 5 ++++- eval-win2016-standard-ssh.json | 5 ++++- eval-win2016-standard.json | 5 ++++- eval-win7x64-enterprise-cygwin.json | 5 ++++- eval-win7x64-enterprise-ssh.json | 5 ++++- eval-win7x64-enterprise.json | 5 ++++- eval-win7x86-enterprise-cygwin.json | 5 ++++- eval-win7x86-enterprise-ssh.json | 5 ++++- eval-win7x86-enterprise.json | 5 ++++- eval-win81x64-enterprise-cygwin.json | 5 ++++- eval-win81x64-enterprise-ssh.json | 5 ++++- eval-win81x64-enterprise.json | 5 ++++- eval-win81x86-enterprise-cygwin.json | 5 ++++- eval-win81x86-enterprise-ssh.json | 5 ++++- eval-win81x86-enterprise.json | 5 ++++- win2008r2-datacenter-cygwin.json | 5 ++++- win2008r2-datacenter-ssh.json | 5 ++++- win2008r2-datacenter.json | 5 ++++- win2008r2-enterprise-cygwin.json | 5 ++++- win2008r2-enterprise-ssh.json | 5 ++++- win2008r2-enterprise.json | 5 ++++- win2008r2-standard-cygwin.json | 5 ++++- win2008r2-standard-ssh.json | 5 ++++- win2008r2-standard.json | 5 ++++- win2008r2-web-cygwin.json | 5 ++++- win2008r2-web-ssh.json | 5 ++++- win2008r2-web.json | 5 ++++- win2012-datacenter-cygwin.json | 5 ++++- win2012-datacenter-ssh.json | 5 ++++- win2012-datacenter.json | 5 ++++- win2012-standard-cygwin.json | 5 ++++- win2012-standard-ssh.json | 5 ++++- win2012-standard.json | 5 ++++- win2012r2-datacenter-cygwin.json | 5 ++++- win2012r2-datacenter-ssh.json | 5 ++++- win2012r2-datacenter.json | 5 ++++- win2012r2-standard-cygwin.json | 5 ++++- win2012r2-standard-ssh.json | 5 ++++- win2012r2-standard.json | 5 ++++- win2012r2-standardcore-cygwin.json | 5 ++++- win2012r2-standardcore-ssh.json | 5 ++++- win2012r2-standardcore.json | 5 ++++- win2016-standard-cygwin.json | 5 ++++- win2016-standard-ssh.json | 5 ++++- win2016-standard.json | 5 ++++- win7x64-enterprise-cygwin.json | 5 ++++- win7x64-enterprise-ssh.json | 5 ++++- win7x64-enterprise.json | 5 ++++- win7x64-pro-cygwin.json | 5 ++++- win7x64-pro-ssh.json | 5 ++++- win7x64-pro.json | 5 ++++- win7x86-enterprise-cygwin.json | 5 ++++- win7x86-enterprise-ssh.json | 5 ++++- win7x86-enterprise.json | 5 ++++- win7x86-pro-cygwin.json | 5 ++++- win7x86-pro-ssh.json | 5 ++++- win7x86-pro.json | 5 ++++- win81x64-enterprise-cygwin.json | 5 ++++- win81x64-enterprise-ssh.json | 5 ++++- win81x64-enterprise.json | 5 ++++- win81x64-pro-cygwin.json | 5 ++++- win81x64-pro-ssh.json | 5 ++++- win81x64-pro.json | 5 ++++- win81x86-enterprise-cygwin.json | 5 ++++- win81x86-enterprise-ssh.json | 5 ++++- win81x86-enterprise.json | 5 ++++- win81x86-pro-cygwin.json | 5 ++++- win81x86-pro-ssh.json | 5 ++++- win81x86-pro.json | 5 ++++- 87 files changed, 348 insertions(+), 87 deletions(-) diff --git a/eval-win10x64-enterprise-cygwin.json b/eval-win10x64-enterprise-cygwin.json index b77c2da3..260fcea2 100644 --- a/eval-win10x64-enterprise-cygwin.json +++ b/eval-win10x64-enterprise-cygwin.json @@ -170,7 +170,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win10x64-enterprise-ssh.json b/eval-win10x64-enterprise-ssh.json index 805f2f0f..1c762c6f 100644 --- a/eval-win10x64-enterprise-ssh.json +++ b/eval-win10x64-enterprise-ssh.json @@ -166,7 +166,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win10x64-enterprise.json b/eval-win10x64-enterprise.json index 0c2f80e3..5d909415 100644 --- a/eval-win10x64-enterprise.json +++ b/eval-win10x64-enterprise.json @@ -166,7 +166,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/eval-win10x86-enterprise-cygwin.json b/eval-win10x86-enterprise-cygwin.json index 1392230c..305223e3 100644 --- a/eval-win10x86-enterprise-cygwin.json +++ b/eval-win10x86-enterprise-cygwin.json @@ -170,7 +170,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win10x86-enterprise-ssh.json b/eval-win10x86-enterprise-ssh.json index 1164be6c..1222fd3f 100644 --- a/eval-win10x86-enterprise-ssh.json +++ b/eval-win10x86-enterprise-ssh.json @@ -166,7 +166,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win10x86-enterprise.json b/eval-win10x86-enterprise.json index 69642454..02148871 100644 --- a/eval-win10x86-enterprise.json +++ b/eval-win10x86-enterprise.json @@ -166,7 +166,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/eval-win2008r2-datacenter-cygwin.json b/eval-win2008r2-datacenter-cygwin.json index 5a5eff7a..8067b838 100644 --- a/eval-win2008r2-datacenter-cygwin.json +++ b/eval-win2008r2-datacenter-cygwin.json @@ -141,7 +141,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win2008r2-datacenter-ssh.json b/eval-win2008r2-datacenter-ssh.json index 6fc212f7..b9f76674 100644 --- a/eval-win2008r2-datacenter-ssh.json +++ b/eval-win2008r2-datacenter-ssh.json @@ -141,7 +141,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win2008r2-datacenter.json b/eval-win2008r2-datacenter.json index e2a00adb..8ac5b71a 100644 --- a/eval-win2008r2-datacenter.json +++ b/eval-win2008r2-datacenter.json @@ -145,7 +145,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/eval-win2008r2-standard-cygwin.json b/eval-win2008r2-standard-cygwin.json index 462cd29b..48f44ee5 100644 --- a/eval-win2008r2-standard-cygwin.json +++ b/eval-win2008r2-standard-cygwin.json @@ -141,7 +141,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win2008r2-standard-ssh.json b/eval-win2008r2-standard-ssh.json index 4c12bd6b..98f24dc2 100644 --- a/eval-win2008r2-standard-ssh.json +++ b/eval-win2008r2-standard-ssh.json @@ -137,7 +137,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win2008r2-standard.json b/eval-win2008r2-standard.json index 9ccefc1b..bc9b2810 100644 --- a/eval-win2008r2-standard.json +++ b/eval-win2008r2-standard.json @@ -141,7 +141,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/eval-win2012r2-datacenter-cygwin.json b/eval-win2012r2-datacenter-cygwin.json index 4423610b..47219c8d 100644 --- a/eval-win2012r2-datacenter-cygwin.json +++ b/eval-win2012r2-datacenter-cygwin.json @@ -158,7 +158,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win2012r2-datacenter-ssh.json b/eval-win2012r2-datacenter-ssh.json index cf223c38..650d9038 100644 --- a/eval-win2012r2-datacenter-ssh.json +++ b/eval-win2012r2-datacenter-ssh.json @@ -154,7 +154,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win2012r2-datacenter.json b/eval-win2012r2-datacenter.json index c9555de5..312732f3 100644 --- a/eval-win2012r2-datacenter.json +++ b/eval-win2012r2-datacenter.json @@ -158,7 +158,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/eval-win2012r2-standard-cygwin.json b/eval-win2012r2-standard-cygwin.json index 8fea4224..89722bd9 100644 --- a/eval-win2012r2-standard-cygwin.json +++ b/eval-win2012r2-standard-cygwin.json @@ -158,7 +158,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win2012r2-standard-ssh.json b/eval-win2012r2-standard-ssh.json index 46e2be0a..1cbdebd9 100644 --- a/eval-win2012r2-standard-ssh.json +++ b/eval-win2012r2-standard-ssh.json @@ -154,7 +154,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win2012r2-standard.json b/eval-win2012r2-standard.json index d30c4b06..3c62a779 100644 --- a/eval-win2012r2-standard.json +++ b/eval-win2012r2-standard.json @@ -158,7 +158,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/eval-win2016-standard-cygwin.json b/eval-win2016-standard-cygwin.json index 41a4a7cb..a1ecf323 100644 --- a/eval-win2016-standard-cygwin.json +++ b/eval-win2016-standard-cygwin.json @@ -158,7 +158,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win2016-standard-ssh.json b/eval-win2016-standard-ssh.json index 9bd167ba..2f768cb6 100644 --- a/eval-win2016-standard-ssh.json +++ b/eval-win2016-standard-ssh.json @@ -154,7 +154,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win2016-standard.json b/eval-win2016-standard.json index ce98548d..90fec5bb 100644 --- a/eval-win2016-standard.json +++ b/eval-win2016-standard.json @@ -158,7 +158,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/eval-win7x64-enterprise-cygwin.json b/eval-win7x64-enterprise-cygwin.json index aa3f1036..8f010c0e 100644 --- a/eval-win7x64-enterprise-cygwin.json +++ b/eval-win7x64-enterprise-cygwin.json @@ -149,7 +149,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win7x64-enterprise-ssh.json b/eval-win7x64-enterprise-ssh.json index a57d6d34..477874f0 100644 --- a/eval-win7x64-enterprise-ssh.json +++ b/eval-win7x64-enterprise-ssh.json @@ -149,7 +149,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win7x64-enterprise.json b/eval-win7x64-enterprise.json index a4eda71d..b3a023cd 100644 --- a/eval-win7x64-enterprise.json +++ b/eval-win7x64-enterprise.json @@ -149,7 +149,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/eval-win7x86-enterprise-cygwin.json b/eval-win7x86-enterprise-cygwin.json index 47ba7622..9a318d77 100644 --- a/eval-win7x86-enterprise-cygwin.json +++ b/eval-win7x86-enterprise-cygwin.json @@ -149,7 +149,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win7x86-enterprise-ssh.json b/eval-win7x86-enterprise-ssh.json index 5ab14885..b2ddd2df 100644 --- a/eval-win7x86-enterprise-ssh.json +++ b/eval-win7x86-enterprise-ssh.json @@ -145,7 +145,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win7x86-enterprise.json b/eval-win7x86-enterprise.json index e658dd5d..56374ce0 100644 --- a/eval-win7x86-enterprise.json +++ b/eval-win7x86-enterprise.json @@ -145,7 +145,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/eval-win81x64-enterprise-cygwin.json b/eval-win81x64-enterprise-cygwin.json index 2dc1ca79..f77cb0d0 100644 --- a/eval-win81x64-enterprise-cygwin.json +++ b/eval-win81x64-enterprise-cygwin.json @@ -150,7 +150,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win81x64-enterprise-ssh.json b/eval-win81x64-enterprise-ssh.json index f1a0b405..7f79dae3 100644 --- a/eval-win81x64-enterprise-ssh.json +++ b/eval-win81x64-enterprise-ssh.json @@ -150,7 +150,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win81x64-enterprise.json b/eval-win81x64-enterprise.json index d1300184..e6b13786 100644 --- a/eval-win81x64-enterprise.json +++ b/eval-win81x64-enterprise.json @@ -154,7 +154,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/eval-win81x86-enterprise-cygwin.json b/eval-win81x86-enterprise-cygwin.json index f4dab180..4d29ced9 100644 --- a/eval-win81x86-enterprise-cygwin.json +++ b/eval-win81x86-enterprise-cygwin.json @@ -150,7 +150,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win81x86-enterprise-ssh.json b/eval-win81x86-enterprise-ssh.json index dac83d44..fb886e5a 100644 --- a/eval-win81x86-enterprise-ssh.json +++ b/eval-win81x86-enterprise-ssh.json @@ -146,7 +146,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/eval-win81x86-enterprise.json b/eval-win81x86-enterprise.json index 0532632a..9222dbe9 100644 --- a/eval-win81x86-enterprise.json +++ b/eval-win81x86-enterprise.json @@ -150,7 +150,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win2008r2-datacenter-cygwin.json b/win2008r2-datacenter-cygwin.json index bbece9ac..28732552 100644 --- a/win2008r2-datacenter-cygwin.json +++ b/win2008r2-datacenter-cygwin.json @@ -141,7 +141,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win2008r2-datacenter-ssh.json b/win2008r2-datacenter-ssh.json index e9ea8ded..8e92d3ec 100644 --- a/win2008r2-datacenter-ssh.json +++ b/win2008r2-datacenter-ssh.json @@ -137,7 +137,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win2008r2-datacenter.json b/win2008r2-datacenter.json index e3bac200..7398b446 100644 --- a/win2008r2-datacenter.json +++ b/win2008r2-datacenter.json @@ -140,7 +140,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win2008r2-enterprise-cygwin.json b/win2008r2-enterprise-cygwin.json index 13dea3f7..c781f622 100644 --- a/win2008r2-enterprise-cygwin.json +++ b/win2008r2-enterprise-cygwin.json @@ -141,7 +141,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win2008r2-enterprise-ssh.json b/win2008r2-enterprise-ssh.json index e2464f25..a184f2dc 100644 --- a/win2008r2-enterprise-ssh.json +++ b/win2008r2-enterprise-ssh.json @@ -137,7 +137,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win2008r2-enterprise.json b/win2008r2-enterprise.json index 81de15a0..b915db6f 100644 --- a/win2008r2-enterprise.json +++ b/win2008r2-enterprise.json @@ -140,7 +140,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win2008r2-standard-cygwin.json b/win2008r2-standard-cygwin.json index 5fd4f1a5..c8454537 100644 --- a/win2008r2-standard-cygwin.json +++ b/win2008r2-standard-cygwin.json @@ -141,7 +141,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win2008r2-standard-ssh.json b/win2008r2-standard-ssh.json index 2090891f..3e471c51 100644 --- a/win2008r2-standard-ssh.json +++ b/win2008r2-standard-ssh.json @@ -137,7 +137,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win2008r2-standard.json b/win2008r2-standard.json index 85924118..7cc66d19 100644 --- a/win2008r2-standard.json +++ b/win2008r2-standard.json @@ -140,7 +140,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win2008r2-web-cygwin.json b/win2008r2-web-cygwin.json index 1de6cd6f..7597129d 100644 --- a/win2008r2-web-cygwin.json +++ b/win2008r2-web-cygwin.json @@ -141,7 +141,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win2008r2-web-ssh.json b/win2008r2-web-ssh.json index 990e56ae..7a780386 100644 --- a/win2008r2-web-ssh.json +++ b/win2008r2-web-ssh.json @@ -137,7 +137,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win2008r2-web.json b/win2008r2-web.json index 93d5bfb2..2a0c1b4f 100644 --- a/win2008r2-web.json +++ b/win2008r2-web.json @@ -140,7 +140,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win2012-datacenter-cygwin.json b/win2012-datacenter-cygwin.json index 0265c188..b2eb5192 100644 --- a/win2012-datacenter-cygwin.json +++ b/win2012-datacenter-cygwin.json @@ -153,7 +153,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win2012-datacenter-ssh.json b/win2012-datacenter-ssh.json index 1e202417..488a19d3 100644 --- a/win2012-datacenter-ssh.json +++ b/win2012-datacenter-ssh.json @@ -149,7 +149,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win2012-datacenter.json b/win2012-datacenter.json index a4447fe7..1992fad7 100644 --- a/win2012-datacenter.json +++ b/win2012-datacenter.json @@ -152,7 +152,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win2012-standard-cygwin.json b/win2012-standard-cygwin.json index 3d22b2f0..5c7194c7 100644 --- a/win2012-standard-cygwin.json +++ b/win2012-standard-cygwin.json @@ -153,7 +153,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win2012-standard-ssh.json b/win2012-standard-ssh.json index 831a135c..f96599bf 100644 --- a/win2012-standard-ssh.json +++ b/win2012-standard-ssh.json @@ -149,7 +149,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win2012-standard.json b/win2012-standard.json index 13b77aa5..aac99328 100644 --- a/win2012-standard.json +++ b/win2012-standard.json @@ -152,7 +152,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win2012r2-datacenter-cygwin.json b/win2012r2-datacenter-cygwin.json index 0214bb6e..1bd84573 100644 --- a/win2012r2-datacenter-cygwin.json +++ b/win2012r2-datacenter-cygwin.json @@ -154,7 +154,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win2012r2-datacenter-ssh.json b/win2012r2-datacenter-ssh.json index 9df13cb4..c5da8a6e 100644 --- a/win2012r2-datacenter-ssh.json +++ b/win2012r2-datacenter-ssh.json @@ -150,7 +150,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win2012r2-datacenter.json b/win2012r2-datacenter.json index 6ef75463..ac308845 100644 --- a/win2012r2-datacenter.json +++ b/win2012r2-datacenter.json @@ -153,7 +153,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win2012r2-standard-cygwin.json b/win2012r2-standard-cygwin.json index 65a3fc32..f040eefb 100644 --- a/win2012r2-standard-cygwin.json +++ b/win2012r2-standard-cygwin.json @@ -154,7 +154,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win2012r2-standard-ssh.json b/win2012r2-standard-ssh.json index 0fa37660..20690a50 100644 --- a/win2012r2-standard-ssh.json +++ b/win2012r2-standard-ssh.json @@ -150,7 +150,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win2012r2-standard.json b/win2012r2-standard.json index d24b2bef..dfdc539b 100644 --- a/win2012r2-standard.json +++ b/win2012r2-standard.json @@ -153,7 +153,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win2012r2-standardcore-cygwin.json b/win2012r2-standardcore-cygwin.json index c894314a..cfd04afd 100644 --- a/win2012r2-standardcore-cygwin.json +++ b/win2012r2-standardcore-cygwin.json @@ -154,7 +154,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win2012r2-standardcore-ssh.json b/win2012r2-standardcore-ssh.json index cbdf5c1d..63b287a9 100644 --- a/win2012r2-standardcore-ssh.json +++ b/win2012r2-standardcore-ssh.json @@ -150,7 +150,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win2012r2-standardcore.json b/win2012r2-standardcore.json index cb5e4c85..4be85c3a 100644 --- a/win2012r2-standardcore.json +++ b/win2012r2-standardcore.json @@ -153,7 +153,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win2016-standard-cygwin.json b/win2016-standard-cygwin.json index 2cec3f29..f008b96f 100644 --- a/win2016-standard-cygwin.json +++ b/win2016-standard-cygwin.json @@ -158,7 +158,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win2016-standard-ssh.json b/win2016-standard-ssh.json index 642d8555..7c4e3cf7 100644 --- a/win2016-standard-ssh.json +++ b/win2016-standard-ssh.json @@ -154,7 +154,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win2016-standard.json b/win2016-standard.json index a2c77baf..4c80c1a3 100644 --- a/win2016-standard.json +++ b/win2016-standard.json @@ -158,7 +158,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win7x64-enterprise-cygwin.json b/win7x64-enterprise-cygwin.json index b539bdc4..4456dd16 100644 --- a/win7x64-enterprise-cygwin.json +++ b/win7x64-enterprise-cygwin.json @@ -145,7 +145,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win7x64-enterprise-ssh.json b/win7x64-enterprise-ssh.json index ed23acb6..10fc0b4d 100644 --- a/win7x64-enterprise-ssh.json +++ b/win7x64-enterprise-ssh.json @@ -141,7 +141,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win7x64-enterprise.json b/win7x64-enterprise.json index c651511a..8ae58144 100644 --- a/win7x64-enterprise.json +++ b/win7x64-enterprise.json @@ -140,7 +140,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win7x64-pro-cygwin.json b/win7x64-pro-cygwin.json index fdd9fcde..43b20663 100644 --- a/win7x64-pro-cygwin.json +++ b/win7x64-pro-cygwin.json @@ -145,7 +145,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win7x64-pro-ssh.json b/win7x64-pro-ssh.json index 1cb9808f..2abebb21 100644 --- a/win7x64-pro-ssh.json +++ b/win7x64-pro-ssh.json @@ -141,7 +141,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win7x64-pro.json b/win7x64-pro.json index d77d25b1..83ce574e 100644 --- a/win7x64-pro.json +++ b/win7x64-pro.json @@ -140,7 +140,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win7x86-enterprise-cygwin.json b/win7x86-enterprise-cygwin.json index 818366f6..60e552df 100644 --- a/win7x86-enterprise-cygwin.json +++ b/win7x86-enterprise-cygwin.json @@ -145,7 +145,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win7x86-enterprise-ssh.json b/win7x86-enterprise-ssh.json index f2197a9f..be09a8e2 100644 --- a/win7x86-enterprise-ssh.json +++ b/win7x86-enterprise-ssh.json @@ -141,7 +141,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win7x86-enterprise.json b/win7x86-enterprise.json index 8233ced5..4c2c0129 100644 --- a/win7x86-enterprise.json +++ b/win7x86-enterprise.json @@ -140,7 +140,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win7x86-pro-cygwin.json b/win7x86-pro-cygwin.json index 016b1b7a..fd5ccce8 100644 --- a/win7x86-pro-cygwin.json +++ b/win7x86-pro-cygwin.json @@ -145,7 +145,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win7x86-pro-ssh.json b/win7x86-pro-ssh.json index 06297497..14c9db1a 100644 --- a/win7x86-pro-ssh.json +++ b/win7x86-pro-ssh.json @@ -141,7 +141,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win7x86-pro.json b/win7x86-pro.json index 8a0f5d47..8c33d0b2 100644 --- a/win7x86-pro.json +++ b/win7x86-pro.json @@ -140,7 +140,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win81x64-enterprise-cygwin.json b/win81x64-enterprise-cygwin.json index 70a7084b..2a3a8c05 100644 --- a/win81x64-enterprise-cygwin.json +++ b/win81x64-enterprise-cygwin.json @@ -146,7 +146,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win81x64-enterprise-ssh.json b/win81x64-enterprise-ssh.json index f2b1d6b5..e0332f03 100644 --- a/win81x64-enterprise-ssh.json +++ b/win81x64-enterprise-ssh.json @@ -142,7 +142,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win81x64-enterprise.json b/win81x64-enterprise.json index 631fd5c0..f5dadd04 100644 --- a/win81x64-enterprise.json +++ b/win81x64-enterprise.json @@ -145,7 +145,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win81x64-pro-cygwin.json b/win81x64-pro-cygwin.json index af194b8a..090d91c0 100644 --- a/win81x64-pro-cygwin.json +++ b/win81x64-pro-cygwin.json @@ -146,7 +146,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win81x64-pro-ssh.json b/win81x64-pro-ssh.json index 566d461d..5325ed9c 100644 --- a/win81x64-pro-ssh.json +++ b/win81x64-pro-ssh.json @@ -142,7 +142,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win81x64-pro.json b/win81x64-pro.json index eecc08cf..36d5dc82 100644 --- a/win81x64-pro.json +++ b/win81x64-pro.json @@ -145,7 +145,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win81x86-enterprise-cygwin.json b/win81x86-enterprise-cygwin.json index 51705cbe..359dc0b9 100644 --- a/win81x86-enterprise-cygwin.json +++ b/win81x86-enterprise-cygwin.json @@ -138,7 +138,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win81x86-enterprise-ssh.json b/win81x86-enterprise-ssh.json index 486ebd1d..df7c34b8 100644 --- a/win81x86-enterprise-ssh.json +++ b/win81x86-enterprise-ssh.json @@ -134,7 +134,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win81x86-enterprise.json b/win81x86-enterprise.json index 55b6d33e..fa15f0d3 100644 --- a/win81x86-enterprise.json +++ b/win81x86-enterprise.json @@ -137,7 +137,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ diff --git a/win81x86-pro-cygwin.json b/win81x86-pro-cygwin.json index 90573714..dfbb6e09 100644 --- a/win81x86-pro-cygwin.json +++ b/win81x86-pro-cygwin.json @@ -138,7 +138,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", diff --git a/win81x86-pro-ssh.json b/win81x86-pro-ssh.json index 87ada8f4..fbbb0c4e 100644 --- a/win81x86-pro-ssh.json +++ b/win81x86-pro-ssh.json @@ -134,7 +134,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", diff --git a/win81x86-pro.json b/win81x86-pro.json index 86723dc2..ac58ed24 100644 --- a/win81x86-pro.json +++ b/win81x86-pro.json @@ -137,7 +137,10 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}", + "CM_VERSION={{user `cm_version`}}",, + "http_proxy={{user `http_proxy`}}", + "https_proxy={{user `https_proxy`}}", + "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ From ef7568ffdb16502f9619daadc266e633e664e435 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Mon, 24 Feb 2020 15:21:08 -0500 Subject: [PATCH 03/13] add proxy env vars to provisioners --- eval-win10x64-enterprise-cygwin.json | 2 +- eval-win10x64-enterprise-ssh.json | 2 +- eval-win10x64-enterprise.json | 2 +- eval-win10x86-enterprise-cygwin.json | 2 +- eval-win10x86-enterprise-ssh.json | 2 +- eval-win10x86-enterprise.json | 2 +- eval-win2008r2-datacenter-cygwin.json | 2 +- eval-win2008r2-datacenter-ssh.json | 2 +- eval-win2008r2-datacenter.json | 2 +- eval-win2008r2-standard-cygwin.json | 2 +- eval-win2008r2-standard-ssh.json | 2 +- eval-win2008r2-standard.json | 2 +- eval-win2012r2-datacenter-cygwin.json | 2 +- eval-win2012r2-datacenter-ssh.json | 2 +- eval-win2012r2-datacenter.json | 2 +- eval-win2012r2-standard-cygwin.json | 2 +- eval-win2012r2-standard-ssh.json | 2 +- eval-win2012r2-standard.json | 2 +- eval-win2016-standard-cygwin.json | 2 +- eval-win2016-standard-ssh.json | 2 +- eval-win2016-standard.json | 2 +- eval-win7x64-enterprise-cygwin.json | 2 +- eval-win7x64-enterprise-ssh.json | 2 +- eval-win7x64-enterprise.json | 2 +- eval-win7x86-enterprise-cygwin.json | 2 +- eval-win7x86-enterprise-ssh.json | 2 +- eval-win7x86-enterprise.json | 2 +- eval-win81x64-enterprise-cygwin.json | 2 +- eval-win81x64-enterprise-ssh.json | 2 +- eval-win81x64-enterprise.json | 2 +- eval-win81x86-enterprise-cygwin.json | 2 +- eval-win81x86-enterprise-ssh.json | 2 +- eval-win81x86-enterprise.json | 2 +- win2008r2-datacenter-cygwin.json | 2 +- win2008r2-datacenter-ssh.json | 2 +- win2008r2-datacenter.json | 2 +- win2008r2-enterprise-cygwin.json | 2 +- win2008r2-enterprise-ssh.json | 2 +- win2008r2-enterprise.json | 2 +- win2008r2-standard-cygwin.json | 2 +- win2008r2-standard-ssh.json | 2 +- win2008r2-standard.json | 2 +- win2008r2-web-cygwin.json | 2 +- win2008r2-web-ssh.json | 2 +- win2008r2-web.json | 2 +- win2012-datacenter-cygwin.json | 2 +- win2012-datacenter-ssh.json | 2 +- win2012-datacenter.json | 2 +- win2012-standard-cygwin.json | 2 +- win2012-standard-ssh.json | 2 +- win2012-standard.json | 2 +- win2012r2-datacenter-cygwin.json | 2 +- win2012r2-datacenter-ssh.json | 2 +- win2012r2-datacenter.json | 2 +- win2012r2-standard-cygwin.json | 2 +- win2012r2-standard-ssh.json | 2 +- win2012r2-standard.json | 2 +- win2012r2-standardcore-cygwin.json | 2 +- win2012r2-standardcore-ssh.json | 2 +- win2012r2-standardcore.json | 2 +- win2016-standard-cygwin.json | 2 +- win2016-standard-ssh.json | 2 +- win2016-standard.json | 2 +- win7x64-enterprise-cygwin.json | 2 +- win7x64-enterprise-ssh.json | 2 +- win7x64-enterprise.json | 2 +- win7x64-pro-cygwin.json | 2 +- win7x64-pro-ssh.json | 2 +- win7x64-pro.json | 2 +- win7x86-enterprise-cygwin.json | 2 +- win7x86-enterprise-ssh.json | 2 +- win7x86-enterprise.json | 2 +- win7x86-pro-cygwin.json | 2 +- win7x86-pro-ssh.json | 2 +- win7x86-pro.json | 2 +- win81x64-enterprise-cygwin.json | 2 +- win81x64-enterprise-ssh.json | 2 +- win81x64-enterprise.json | 2 +- win81x64-pro-cygwin.json | 2 +- win81x64-pro-ssh.json | 2 +- win81x64-pro.json | 2 +- win81x86-enterprise-cygwin.json | 2 +- win81x86-enterprise-ssh.json | 2 +- win81x86-enterprise.json | 2 +- win81x86-pro-cygwin.json | 2 +- win81x86-pro-ssh.json | 2 +- win81x86-pro.json | 2 +- 87 files changed, 87 insertions(+), 87 deletions(-) diff --git a/eval-win10x64-enterprise-cygwin.json b/eval-win10x64-enterprise-cygwin.json index 260fcea2..4e36e8bd 100644 --- a/eval-win10x64-enterprise-cygwin.json +++ b/eval-win10x64-enterprise-cygwin.json @@ -170,7 +170,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win10x64-enterprise-ssh.json b/eval-win10x64-enterprise-ssh.json index 1c762c6f..98a78eeb 100644 --- a/eval-win10x64-enterprise-ssh.json +++ b/eval-win10x64-enterprise-ssh.json @@ -166,7 +166,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win10x64-enterprise.json b/eval-win10x64-enterprise.json index 5d909415..12ac6b2d 100644 --- a/eval-win10x64-enterprise.json +++ b/eval-win10x64-enterprise.json @@ -166,7 +166,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win10x86-enterprise-cygwin.json b/eval-win10x86-enterprise-cygwin.json index 305223e3..3bdc6036 100644 --- a/eval-win10x86-enterprise-cygwin.json +++ b/eval-win10x86-enterprise-cygwin.json @@ -170,7 +170,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win10x86-enterprise-ssh.json b/eval-win10x86-enterprise-ssh.json index 1222fd3f..0242b307 100644 --- a/eval-win10x86-enterprise-ssh.json +++ b/eval-win10x86-enterprise-ssh.json @@ -166,7 +166,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win10x86-enterprise.json b/eval-win10x86-enterprise.json index 02148871..fd5c7e25 100644 --- a/eval-win10x86-enterprise.json +++ b/eval-win10x86-enterprise.json @@ -166,7 +166,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win2008r2-datacenter-cygwin.json b/eval-win2008r2-datacenter-cygwin.json index 8067b838..39d194a6 100644 --- a/eval-win2008r2-datacenter-cygwin.json +++ b/eval-win2008r2-datacenter-cygwin.json @@ -141,7 +141,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win2008r2-datacenter-ssh.json b/eval-win2008r2-datacenter-ssh.json index b9f76674..09d49151 100644 --- a/eval-win2008r2-datacenter-ssh.json +++ b/eval-win2008r2-datacenter-ssh.json @@ -141,7 +141,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win2008r2-datacenter.json b/eval-win2008r2-datacenter.json index 8ac5b71a..57587860 100644 --- a/eval-win2008r2-datacenter.json +++ b/eval-win2008r2-datacenter.json @@ -145,7 +145,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win2008r2-standard-cygwin.json b/eval-win2008r2-standard-cygwin.json index 48f44ee5..21834e6d 100644 --- a/eval-win2008r2-standard-cygwin.json +++ b/eval-win2008r2-standard-cygwin.json @@ -141,7 +141,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win2008r2-standard-ssh.json b/eval-win2008r2-standard-ssh.json index 98f24dc2..bd60ec7b 100644 --- a/eval-win2008r2-standard-ssh.json +++ b/eval-win2008r2-standard-ssh.json @@ -137,7 +137,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win2008r2-standard.json b/eval-win2008r2-standard.json index bc9b2810..65d603d3 100644 --- a/eval-win2008r2-standard.json +++ b/eval-win2008r2-standard.json @@ -141,7 +141,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win2012r2-datacenter-cygwin.json b/eval-win2012r2-datacenter-cygwin.json index 47219c8d..21c37908 100644 --- a/eval-win2012r2-datacenter-cygwin.json +++ b/eval-win2012r2-datacenter-cygwin.json @@ -158,7 +158,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win2012r2-datacenter-ssh.json b/eval-win2012r2-datacenter-ssh.json index 650d9038..126aa12e 100644 --- a/eval-win2012r2-datacenter-ssh.json +++ b/eval-win2012r2-datacenter-ssh.json @@ -154,7 +154,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win2012r2-datacenter.json b/eval-win2012r2-datacenter.json index 312732f3..2c940809 100644 --- a/eval-win2012r2-datacenter.json +++ b/eval-win2012r2-datacenter.json @@ -158,7 +158,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win2012r2-standard-cygwin.json b/eval-win2012r2-standard-cygwin.json index 89722bd9..264f2fe3 100644 --- a/eval-win2012r2-standard-cygwin.json +++ b/eval-win2012r2-standard-cygwin.json @@ -158,7 +158,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win2012r2-standard-ssh.json b/eval-win2012r2-standard-ssh.json index 1cbdebd9..51033265 100644 --- a/eval-win2012r2-standard-ssh.json +++ b/eval-win2012r2-standard-ssh.json @@ -154,7 +154,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win2012r2-standard.json b/eval-win2012r2-standard.json index 3c62a779..3a1cbe60 100644 --- a/eval-win2012r2-standard.json +++ b/eval-win2012r2-standard.json @@ -158,7 +158,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win2016-standard-cygwin.json b/eval-win2016-standard-cygwin.json index a1ecf323..8a114456 100644 --- a/eval-win2016-standard-cygwin.json +++ b/eval-win2016-standard-cygwin.json @@ -158,7 +158,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win2016-standard-ssh.json b/eval-win2016-standard-ssh.json index 2f768cb6..a8515ca1 100644 --- a/eval-win2016-standard-ssh.json +++ b/eval-win2016-standard-ssh.json @@ -154,7 +154,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win2016-standard.json b/eval-win2016-standard.json index 90fec5bb..3f38818c 100644 --- a/eval-win2016-standard.json +++ b/eval-win2016-standard.json @@ -158,7 +158,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win7x64-enterprise-cygwin.json b/eval-win7x64-enterprise-cygwin.json index 8f010c0e..2399cd36 100644 --- a/eval-win7x64-enterprise-cygwin.json +++ b/eval-win7x64-enterprise-cygwin.json @@ -149,7 +149,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win7x64-enterprise-ssh.json b/eval-win7x64-enterprise-ssh.json index 477874f0..74c39709 100644 --- a/eval-win7x64-enterprise-ssh.json +++ b/eval-win7x64-enterprise-ssh.json @@ -149,7 +149,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win7x64-enterprise.json b/eval-win7x64-enterprise.json index b3a023cd..adcfec2d 100644 --- a/eval-win7x64-enterprise.json +++ b/eval-win7x64-enterprise.json @@ -149,7 +149,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win7x86-enterprise-cygwin.json b/eval-win7x86-enterprise-cygwin.json index 9a318d77..1e75840a 100644 --- a/eval-win7x86-enterprise-cygwin.json +++ b/eval-win7x86-enterprise-cygwin.json @@ -149,7 +149,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win7x86-enterprise-ssh.json b/eval-win7x86-enterprise-ssh.json index b2ddd2df..1ce12dd4 100644 --- a/eval-win7x86-enterprise-ssh.json +++ b/eval-win7x86-enterprise-ssh.json @@ -145,7 +145,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win7x86-enterprise.json b/eval-win7x86-enterprise.json index 56374ce0..91876144 100644 --- a/eval-win7x86-enterprise.json +++ b/eval-win7x86-enterprise.json @@ -145,7 +145,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win81x64-enterprise-cygwin.json b/eval-win81x64-enterprise-cygwin.json index f77cb0d0..d592a3f3 100644 --- a/eval-win81x64-enterprise-cygwin.json +++ b/eval-win81x64-enterprise-cygwin.json @@ -150,7 +150,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win81x64-enterprise-ssh.json b/eval-win81x64-enterprise-ssh.json index 7f79dae3..1cf75e25 100644 --- a/eval-win81x64-enterprise-ssh.json +++ b/eval-win81x64-enterprise-ssh.json @@ -150,7 +150,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win81x64-enterprise.json b/eval-win81x64-enterprise.json index e6b13786..38459638 100644 --- a/eval-win81x64-enterprise.json +++ b/eval-win81x64-enterprise.json @@ -154,7 +154,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win81x86-enterprise-cygwin.json b/eval-win81x86-enterprise-cygwin.json index 4d29ced9..f60e8065 100644 --- a/eval-win81x86-enterprise-cygwin.json +++ b/eval-win81x86-enterprise-cygwin.json @@ -150,7 +150,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win81x86-enterprise-ssh.json b/eval-win81x86-enterprise-ssh.json index fb886e5a..88a197f2 100644 --- a/eval-win81x86-enterprise-ssh.json +++ b/eval-win81x86-enterprise-ssh.json @@ -146,7 +146,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/eval-win81x86-enterprise.json b/eval-win81x86-enterprise.json index 9222dbe9..c499d529 100644 --- a/eval-win81x86-enterprise.json +++ b/eval-win81x86-enterprise.json @@ -150,7 +150,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2008r2-datacenter-cygwin.json b/win2008r2-datacenter-cygwin.json index 28732552..a55310aa 100644 --- a/win2008r2-datacenter-cygwin.json +++ b/win2008r2-datacenter-cygwin.json @@ -141,7 +141,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2008r2-datacenter-ssh.json b/win2008r2-datacenter-ssh.json index 8e92d3ec..d440b8ed 100644 --- a/win2008r2-datacenter-ssh.json +++ b/win2008r2-datacenter-ssh.json @@ -137,7 +137,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2008r2-datacenter.json b/win2008r2-datacenter.json index 7398b446..d2f02088 100644 --- a/win2008r2-datacenter.json +++ b/win2008r2-datacenter.json @@ -140,7 +140,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2008r2-enterprise-cygwin.json b/win2008r2-enterprise-cygwin.json index c781f622..e7c97346 100644 --- a/win2008r2-enterprise-cygwin.json +++ b/win2008r2-enterprise-cygwin.json @@ -141,7 +141,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2008r2-enterprise-ssh.json b/win2008r2-enterprise-ssh.json index a184f2dc..8bfbaff1 100644 --- a/win2008r2-enterprise-ssh.json +++ b/win2008r2-enterprise-ssh.json @@ -137,7 +137,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2008r2-enterprise.json b/win2008r2-enterprise.json index b915db6f..3968b567 100644 --- a/win2008r2-enterprise.json +++ b/win2008r2-enterprise.json @@ -140,7 +140,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2008r2-standard-cygwin.json b/win2008r2-standard-cygwin.json index c8454537..4d381fae 100644 --- a/win2008r2-standard-cygwin.json +++ b/win2008r2-standard-cygwin.json @@ -141,7 +141,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2008r2-standard-ssh.json b/win2008r2-standard-ssh.json index 3e471c51..af9a1d44 100644 --- a/win2008r2-standard-ssh.json +++ b/win2008r2-standard-ssh.json @@ -137,7 +137,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2008r2-standard.json b/win2008r2-standard.json index 7cc66d19..7fc0db3c 100644 --- a/win2008r2-standard.json +++ b/win2008r2-standard.json @@ -140,7 +140,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2008r2-web-cygwin.json b/win2008r2-web-cygwin.json index 7597129d..d8fab91a 100644 --- a/win2008r2-web-cygwin.json +++ b/win2008r2-web-cygwin.json @@ -141,7 +141,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2008r2-web-ssh.json b/win2008r2-web-ssh.json index 7a780386..c5b84509 100644 --- a/win2008r2-web-ssh.json +++ b/win2008r2-web-ssh.json @@ -137,7 +137,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2008r2-web.json b/win2008r2-web.json index 2a0c1b4f..e3af4dde 100644 --- a/win2008r2-web.json +++ b/win2008r2-web.json @@ -140,7 +140,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2012-datacenter-cygwin.json b/win2012-datacenter-cygwin.json index b2eb5192..734ce110 100644 --- a/win2012-datacenter-cygwin.json +++ b/win2012-datacenter-cygwin.json @@ -153,7 +153,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2012-datacenter-ssh.json b/win2012-datacenter-ssh.json index 488a19d3..ab28e88e 100644 --- a/win2012-datacenter-ssh.json +++ b/win2012-datacenter-ssh.json @@ -149,7 +149,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2012-datacenter.json b/win2012-datacenter.json index 1992fad7..7d07bf12 100644 --- a/win2012-datacenter.json +++ b/win2012-datacenter.json @@ -152,7 +152,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2012-standard-cygwin.json b/win2012-standard-cygwin.json index 5c7194c7..c9d18613 100644 --- a/win2012-standard-cygwin.json +++ b/win2012-standard-cygwin.json @@ -153,7 +153,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2012-standard-ssh.json b/win2012-standard-ssh.json index f96599bf..2ba4aa70 100644 --- a/win2012-standard-ssh.json +++ b/win2012-standard-ssh.json @@ -149,7 +149,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2012-standard.json b/win2012-standard.json index aac99328..c1598f74 100644 --- a/win2012-standard.json +++ b/win2012-standard.json @@ -152,7 +152,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2012r2-datacenter-cygwin.json b/win2012r2-datacenter-cygwin.json index 1bd84573..72ac596a 100644 --- a/win2012r2-datacenter-cygwin.json +++ b/win2012r2-datacenter-cygwin.json @@ -154,7 +154,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2012r2-datacenter-ssh.json b/win2012r2-datacenter-ssh.json index c5da8a6e..a70a581d 100644 --- a/win2012r2-datacenter-ssh.json +++ b/win2012r2-datacenter-ssh.json @@ -150,7 +150,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2012r2-datacenter.json b/win2012r2-datacenter.json index ac308845..ef48fb1d 100644 --- a/win2012r2-datacenter.json +++ b/win2012r2-datacenter.json @@ -153,7 +153,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2012r2-standard-cygwin.json b/win2012r2-standard-cygwin.json index f040eefb..8c8b1bb3 100644 --- a/win2012r2-standard-cygwin.json +++ b/win2012r2-standard-cygwin.json @@ -154,7 +154,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2012r2-standard-ssh.json b/win2012r2-standard-ssh.json index 20690a50..57f3d499 100644 --- a/win2012r2-standard-ssh.json +++ b/win2012r2-standard-ssh.json @@ -150,7 +150,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2012r2-standard.json b/win2012r2-standard.json index dfdc539b..25e672cc 100644 --- a/win2012r2-standard.json +++ b/win2012r2-standard.json @@ -153,7 +153,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2012r2-standardcore-cygwin.json b/win2012r2-standardcore-cygwin.json index cfd04afd..3e4084dc 100644 --- a/win2012r2-standardcore-cygwin.json +++ b/win2012r2-standardcore-cygwin.json @@ -154,7 +154,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2012r2-standardcore-ssh.json b/win2012r2-standardcore-ssh.json index 63b287a9..8b825327 100644 --- a/win2012r2-standardcore-ssh.json +++ b/win2012r2-standardcore-ssh.json @@ -150,7 +150,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2012r2-standardcore.json b/win2012r2-standardcore.json index 4be85c3a..c643550f 100644 --- a/win2012r2-standardcore.json +++ b/win2012r2-standardcore.json @@ -153,7 +153,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2016-standard-cygwin.json b/win2016-standard-cygwin.json index f008b96f..ebb635a0 100644 --- a/win2016-standard-cygwin.json +++ b/win2016-standard-cygwin.json @@ -158,7 +158,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2016-standard-ssh.json b/win2016-standard-ssh.json index 7c4e3cf7..05049dbe 100644 --- a/win2016-standard-ssh.json +++ b/win2016-standard-ssh.json @@ -154,7 +154,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win2016-standard.json b/win2016-standard.json index 4c80c1a3..905b0bd1 100644 --- a/win2016-standard.json +++ b/win2016-standard.json @@ -158,7 +158,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win7x64-enterprise-cygwin.json b/win7x64-enterprise-cygwin.json index 4456dd16..527ed9e9 100644 --- a/win7x64-enterprise-cygwin.json +++ b/win7x64-enterprise-cygwin.json @@ -145,7 +145,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win7x64-enterprise-ssh.json b/win7x64-enterprise-ssh.json index 10fc0b4d..eceb5aa1 100644 --- a/win7x64-enterprise-ssh.json +++ b/win7x64-enterprise-ssh.json @@ -141,7 +141,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win7x64-enterprise.json b/win7x64-enterprise.json index 8ae58144..f05fefc3 100644 --- a/win7x64-enterprise.json +++ b/win7x64-enterprise.json @@ -140,7 +140,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win7x64-pro-cygwin.json b/win7x64-pro-cygwin.json index 43b20663..bdee59fe 100644 --- a/win7x64-pro-cygwin.json +++ b/win7x64-pro-cygwin.json @@ -145,7 +145,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win7x64-pro-ssh.json b/win7x64-pro-ssh.json index 2abebb21..f3001d30 100644 --- a/win7x64-pro-ssh.json +++ b/win7x64-pro-ssh.json @@ -141,7 +141,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win7x64-pro.json b/win7x64-pro.json index 83ce574e..ccd41d23 100644 --- a/win7x64-pro.json +++ b/win7x64-pro.json @@ -140,7 +140,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win7x86-enterprise-cygwin.json b/win7x86-enterprise-cygwin.json index 60e552df..74dfb4f6 100644 --- a/win7x86-enterprise-cygwin.json +++ b/win7x86-enterprise-cygwin.json @@ -145,7 +145,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win7x86-enterprise-ssh.json b/win7x86-enterprise-ssh.json index be09a8e2..fddf6198 100644 --- a/win7x86-enterprise-ssh.json +++ b/win7x86-enterprise-ssh.json @@ -141,7 +141,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win7x86-enterprise.json b/win7x86-enterprise.json index 4c2c0129..a73583a1 100644 --- a/win7x86-enterprise.json +++ b/win7x86-enterprise.json @@ -140,7 +140,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win7x86-pro-cygwin.json b/win7x86-pro-cygwin.json index fd5ccce8..c7756aa4 100644 --- a/win7x86-pro-cygwin.json +++ b/win7x86-pro-cygwin.json @@ -145,7 +145,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win7x86-pro-ssh.json b/win7x86-pro-ssh.json index 14c9db1a..23302b47 100644 --- a/win7x86-pro-ssh.json +++ b/win7x86-pro-ssh.json @@ -141,7 +141,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win7x86-pro.json b/win7x86-pro.json index 8c33d0b2..ba2851f3 100644 --- a/win7x86-pro.json +++ b/win7x86-pro.json @@ -140,7 +140,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win81x64-enterprise-cygwin.json b/win81x64-enterprise-cygwin.json index 2a3a8c05..f37fcdf4 100644 --- a/win81x64-enterprise-cygwin.json +++ b/win81x64-enterprise-cygwin.json @@ -146,7 +146,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win81x64-enterprise-ssh.json b/win81x64-enterprise-ssh.json index e0332f03..bf31c6c6 100644 --- a/win81x64-enterprise-ssh.json +++ b/win81x64-enterprise-ssh.json @@ -142,7 +142,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win81x64-enterprise.json b/win81x64-enterprise.json index f5dadd04..ca322da1 100644 --- a/win81x64-enterprise.json +++ b/win81x64-enterprise.json @@ -145,7 +145,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win81x64-pro-cygwin.json b/win81x64-pro-cygwin.json index 090d91c0..7837a6fb 100644 --- a/win81x64-pro-cygwin.json +++ b/win81x64-pro-cygwin.json @@ -146,7 +146,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win81x64-pro-ssh.json b/win81x64-pro-ssh.json index 5325ed9c..691ffcfb 100644 --- a/win81x64-pro-ssh.json +++ b/win81x64-pro-ssh.json @@ -142,7 +142,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win81x64-pro.json b/win81x64-pro.json index 36d5dc82..a61a0abb 100644 --- a/win81x64-pro.json +++ b/win81x64-pro.json @@ -145,7 +145,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win81x86-enterprise-cygwin.json b/win81x86-enterprise-cygwin.json index 359dc0b9..9333ea2f 100644 --- a/win81x86-enterprise-cygwin.json +++ b/win81x86-enterprise-cygwin.json @@ -138,7 +138,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win81x86-enterprise-ssh.json b/win81x86-enterprise-ssh.json index df7c34b8..cec6f465 100644 --- a/win81x86-enterprise-ssh.json +++ b/win81x86-enterprise-ssh.json @@ -134,7 +134,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win81x86-enterprise.json b/win81x86-enterprise.json index fa15f0d3..843a6780 100644 --- a/win81x86-enterprise.json +++ b/win81x86-enterprise.json @@ -137,7 +137,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win81x86-pro-cygwin.json b/win81x86-pro-cygwin.json index dfbb6e09..d377191c 100644 --- a/win81x86-pro-cygwin.json +++ b/win81x86-pro-cygwin.json @@ -138,7 +138,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win81x86-pro-ssh.json b/win81x86-pro-ssh.json index fbbb0c4e..8e80286a 100644 --- a/win81x86-pro-ssh.json +++ b/win81x86-pro-ssh.json @@ -134,7 +134,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", diff --git a/win81x86-pro.json b/win81x86-pro.json index ac58ed24..5600a8d1 100644 --- a/win81x86-pro.json +++ b/win81x86-pro.json @@ -137,7 +137,7 @@ "environment_vars": [ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", - "CM_VERSION={{user `cm_version`}}",, + "CM_VERSION={{user `cm_version`}}", "http_proxy={{user `http_proxy`}}", "https_proxy={{user `https_proxy`}}", "no_proxy={{user `no_proxy`}}", From f83ac2670a0b9d58f06528709e0c3c7651f66d7e Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Mon, 24 Feb 2020 15:24:32 -0500 Subject: [PATCH 04/13] add proxy env vars to variables --- eval-win10x64-enterprise-cygwin.json | 5 ++++- eval-win10x64-enterprise-ssh.json | 5 ++++- eval-win10x64-enterprise.json | 5 ++++- eval-win10x86-enterprise-cygwin.json | 5 ++++- eval-win10x86-enterprise-ssh.json | 5 ++++- eval-win10x86-enterprise.json | 5 ++++- eval-win2008r2-datacenter-cygwin.json | 5 ++++- eval-win2008r2-datacenter-ssh.json | 5 ++++- eval-win2008r2-datacenter.json | 5 ++++- eval-win2008r2-standard-cygwin.json | 5 ++++- eval-win2008r2-standard-ssh.json | 5 ++++- eval-win2008r2-standard.json | 5 ++++- eval-win2012r2-datacenter-cygwin.json | 5 ++++- eval-win2012r2-datacenter-ssh.json | 5 ++++- eval-win2012r2-datacenter.json | 5 ++++- eval-win2012r2-standard-cygwin.json | 5 ++++- eval-win2012r2-standard-ssh.json | 5 ++++- eval-win2012r2-standard.json | 5 ++++- eval-win2016-standard-cygwin.json | 5 ++++- eval-win2016-standard-ssh.json | 5 ++++- eval-win2016-standard.json | 5 ++++- eval-win7x64-enterprise-cygwin.json | 5 ++++- eval-win7x64-enterprise-ssh.json | 5 ++++- eval-win7x64-enterprise.json | 5 ++++- eval-win7x86-enterprise-cygwin.json | 5 ++++- eval-win7x86-enterprise-ssh.json | 5 ++++- eval-win7x86-enterprise.json | 5 ++++- eval-win81x64-enterprise-cygwin.json | 5 ++++- eval-win81x64-enterprise-ssh.json | 5 ++++- eval-win81x64-enterprise.json | 5 ++++- eval-win81x86-enterprise-cygwin.json | 5 ++++- eval-win81x86-enterprise-ssh.json | 5 ++++- eval-win81x86-enterprise.json | 5 ++++- win2008r2-datacenter-cygwin.json | 5 ++++- win2008r2-datacenter-ssh.json | 5 ++++- win2008r2-datacenter.json | 5 ++++- win2008r2-enterprise-cygwin.json | 5 ++++- win2008r2-enterprise-ssh.json | 5 ++++- win2008r2-enterprise.json | 5 ++++- win2008r2-standard-cygwin.json | 5 ++++- win2008r2-standard-ssh.json | 5 ++++- win2008r2-standard.json | 5 ++++- win2008r2-web-cygwin.json | 5 ++++- win2008r2-web-ssh.json | 5 ++++- win2008r2-web.json | 5 ++++- win2012-datacenter-cygwin.json | 5 ++++- win2012-datacenter-ssh.json | 5 ++++- win2012-datacenter.json | 5 ++++- win2012-standard-cygwin.json | 5 ++++- win2012-standard-ssh.json | 5 ++++- win2012-standard.json | 5 ++++- win2012r2-datacenter-cygwin.json | 5 ++++- win2012r2-datacenter-ssh.json | 5 ++++- win2012r2-datacenter.json | 5 ++++- win2012r2-standard-cygwin.json | 5 ++++- win2012r2-standard-ssh.json | 5 ++++- win2012r2-standard.json | 5 ++++- win2012r2-standardcore-cygwin.json | 5 ++++- win2012r2-standardcore-ssh.json | 5 ++++- win2012r2-standardcore.json | 5 ++++- win2016-standard-cygwin.json | 5 ++++- win2016-standard-ssh.json | 5 ++++- win2016-standard.json | 5 ++++- win7x64-enterprise-cygwin.json | 5 ++++- win7x64-enterprise-ssh.json | 5 ++++- win7x64-enterprise.json | 5 ++++- win7x64-pro-cygwin.json | 5 ++++- win7x64-pro-ssh.json | 5 ++++- win7x64-pro.json | 5 ++++- win7x86-enterprise-cygwin.json | 5 ++++- win7x86-enterprise-ssh.json | 5 ++++- win7x86-enterprise.json | 5 ++++- win7x86-pro-cygwin.json | 5 ++++- win7x86-pro-ssh.json | 5 ++++- win7x86-pro.json | 5 ++++- win81x64-enterprise-cygwin.json | 5 ++++- win81x64-enterprise-ssh.json | 5 ++++- win81x64-enterprise.json | 5 ++++- win81x64-pro-cygwin.json | 5 ++++- win81x64-pro-ssh.json | 5 ++++- win81x64-pro.json | 5 ++++- win81x86-enterprise-cygwin.json | 5 ++++- win81x86-enterprise-ssh.json | 5 ++++- win81x86-enterprise.json | 5 ++++- win81x86-pro-cygwin.json | 5 ++++- win81x86-pro-ssh.json | 5 ++++- win81x86-pro.json | 5 ++++- 87 files changed, 348 insertions(+), 87 deletions(-) diff --git a/eval-win10x64-enterprise-cygwin.json b/eval-win10x64-enterprise-cygwin.json index 4e36e8bd..bd060960 100644 --- a/eval-win10x64-enterprise-cygwin.json +++ b/eval-win10x64-enterprise-cygwin.json @@ -201,7 +201,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win10x64-enterprise-ssh.json b/eval-win10x64-enterprise-ssh.json index 98a78eeb..aabd8946 100644 --- a/eval-win10x64-enterprise-ssh.json +++ b/eval-win10x64-enterprise-ssh.json @@ -197,7 +197,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win10x64-enterprise.json b/eval-win10x64-enterprise.json index 12ac6b2d..93bfe21a 100644 --- a/eval-win10x64-enterprise.json +++ b/eval-win10x64-enterprise.json @@ -189,7 +189,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win10x86-enterprise-cygwin.json b/eval-win10x86-enterprise-cygwin.json index 3bdc6036..e6a2e8d2 100644 --- a/eval-win10x86-enterprise-cygwin.json +++ b/eval-win10x86-enterprise-cygwin.json @@ -201,7 +201,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win10x86-enterprise-ssh.json b/eval-win10x86-enterprise-ssh.json index 0242b307..14b6e5a4 100644 --- a/eval-win10x86-enterprise-ssh.json +++ b/eval-win10x86-enterprise-ssh.json @@ -197,7 +197,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win10x86-enterprise.json b/eval-win10x86-enterprise.json index fd5c7e25..1e326174 100644 --- a/eval-win10x86-enterprise.json +++ b/eval-win10x86-enterprise.json @@ -189,7 +189,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-datacenter-cygwin.json b/eval-win2008r2-datacenter-cygwin.json index 39d194a6..01ff0346 100644 --- a/eval-win2008r2-datacenter-cygwin.json +++ b/eval-win2008r2-datacenter-cygwin.json @@ -172,7 +172,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-datacenter-ssh.json b/eval-win2008r2-datacenter-ssh.json index 09d49151..a7b68feb 100644 --- a/eval-win2008r2-datacenter-ssh.json +++ b/eval-win2008r2-datacenter-ssh.json @@ -172,7 +172,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-datacenter.json b/eval-win2008r2-datacenter.json index 57587860..a7b7d301 100644 --- a/eval-win2008r2-datacenter.json +++ b/eval-win2008r2-datacenter.json @@ -168,7 +168,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-standard-cygwin.json b/eval-win2008r2-standard-cygwin.json index 21834e6d..47acf31b 100644 --- a/eval-win2008r2-standard-cygwin.json +++ b/eval-win2008r2-standard-cygwin.json @@ -172,7 +172,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-standard-ssh.json b/eval-win2008r2-standard-ssh.json index bd60ec7b..bc11cc78 100644 --- a/eval-win2008r2-standard-ssh.json +++ b/eval-win2008r2-standard-ssh.json @@ -168,7 +168,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-standard.json b/eval-win2008r2-standard.json index 65d603d3..1167ac1e 100644 --- a/eval-win2008r2-standard.json +++ b/eval-win2008r2-standard.json @@ -164,7 +164,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-datacenter-cygwin.json b/eval-win2012r2-datacenter-cygwin.json index 21c37908..ad5bbc2b 100644 --- a/eval-win2012r2-datacenter-cygwin.json +++ b/eval-win2012r2-datacenter-cygwin.json @@ -189,7 +189,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-datacenter-ssh.json b/eval-win2012r2-datacenter-ssh.json index 126aa12e..867d381b 100644 --- a/eval-win2012r2-datacenter-ssh.json +++ b/eval-win2012r2-datacenter-ssh.json @@ -185,7 +185,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-datacenter.json b/eval-win2012r2-datacenter.json index 2c940809..a3aaf796 100644 --- a/eval-win2012r2-datacenter.json +++ b/eval-win2012r2-datacenter.json @@ -181,7 +181,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-standard-cygwin.json b/eval-win2012r2-standard-cygwin.json index 264f2fe3..669ee796 100644 --- a/eval-win2012r2-standard-cygwin.json +++ b/eval-win2012r2-standard-cygwin.json @@ -189,7 +189,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-standard-ssh.json b/eval-win2012r2-standard-ssh.json index 51033265..d1a8260b 100644 --- a/eval-win2012r2-standard-ssh.json +++ b/eval-win2012r2-standard-ssh.json @@ -185,7 +185,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-standard.json b/eval-win2012r2-standard.json index 3a1cbe60..1b961a44 100644 --- a/eval-win2012r2-standard.json +++ b/eval-win2012r2-standard.json @@ -181,7 +181,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2016-standard-cygwin.json b/eval-win2016-standard-cygwin.json index 8a114456..f55e15d6 100644 --- a/eval-win2016-standard-cygwin.json +++ b/eval-win2016-standard-cygwin.json @@ -189,7 +189,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2016-standard-ssh.json b/eval-win2016-standard-ssh.json index a8515ca1..98305a96 100644 --- a/eval-win2016-standard-ssh.json +++ b/eval-win2016-standard-ssh.json @@ -185,7 +185,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2016-standard.json b/eval-win2016-standard.json index 3f38818c..b36b3838 100644 --- a/eval-win2016-standard.json +++ b/eval-win2016-standard.json @@ -181,7 +181,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x64-enterprise-cygwin.json b/eval-win7x64-enterprise-cygwin.json index 2399cd36..20ec430b 100644 --- a/eval-win7x64-enterprise-cygwin.json +++ b/eval-win7x64-enterprise-cygwin.json @@ -180,7 +180,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "3072", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x64-enterprise-ssh.json b/eval-win7x64-enterprise-ssh.json index 74c39709..06b002de 100644 --- a/eval-win7x64-enterprise-ssh.json +++ b/eval-win7x64-enterprise-ssh.json @@ -180,7 +180,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "3072", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x64-enterprise.json b/eval-win7x64-enterprise.json index adcfec2d..64bab509 100644 --- a/eval-win7x64-enterprise.json +++ b/eval-win7x64-enterprise.json @@ -172,7 +172,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "3072", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x86-enterprise-cygwin.json b/eval-win7x86-enterprise-cygwin.json index 1e75840a..6463eb73 100644 --- a/eval-win7x86-enterprise-cygwin.json +++ b/eval-win7x86-enterprise-cygwin.json @@ -180,7 +180,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x86-enterprise-ssh.json b/eval-win7x86-enterprise-ssh.json index 1ce12dd4..ec3d3b43 100644 --- a/eval-win7x86-enterprise-ssh.json +++ b/eval-win7x86-enterprise-ssh.json @@ -176,7 +176,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x86-enterprise.json b/eval-win7x86-enterprise.json index 91876144..a0aead3e 100644 --- a/eval-win7x86-enterprise.json +++ b/eval-win7x86-enterprise.json @@ -168,7 +168,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x64-enterprise-cygwin.json b/eval-win81x64-enterprise-cygwin.json index d592a3f3..f4878e9e 100644 --- a/eval-win81x64-enterprise-cygwin.json +++ b/eval-win81x64-enterprise-cygwin.json @@ -181,7 +181,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x64-enterprise-ssh.json b/eval-win81x64-enterprise-ssh.json index 1cf75e25..184a4aaf 100644 --- a/eval-win81x64-enterprise-ssh.json +++ b/eval-win81x64-enterprise-ssh.json @@ -181,7 +181,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x64-enterprise.json b/eval-win81x64-enterprise.json index 38459638..1c3b8bbc 100644 --- a/eval-win81x64-enterprise.json +++ b/eval-win81x64-enterprise.json @@ -177,7 +177,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x86-enterprise-cygwin.json b/eval-win81x86-enterprise-cygwin.json index f60e8065..a2f0b1d1 100644 --- a/eval-win81x86-enterprise-cygwin.json +++ b/eval-win81x86-enterprise-cygwin.json @@ -181,7 +181,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x86-enterprise-ssh.json b/eval-win81x86-enterprise-ssh.json index 88a197f2..8e24cdc4 100644 --- a/eval-win81x86-enterprise-ssh.json +++ b/eval-win81x86-enterprise-ssh.json @@ -177,7 +177,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x86-enterprise.json b/eval-win81x86-enterprise.json index c499d529..42ea29ac 100644 --- a/eval-win81x86-enterprise.json +++ b/eval-win81x86-enterprise.json @@ -173,7 +173,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-datacenter-cygwin.json b/win2008r2-datacenter-cygwin.json index a55310aa..c91a1f78 100644 --- a/win2008r2-datacenter-cygwin.json +++ b/win2008r2-datacenter-cygwin.json @@ -172,7 +172,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-datacenter-ssh.json b/win2008r2-datacenter-ssh.json index d440b8ed..0e5137fe 100644 --- a/win2008r2-datacenter-ssh.json +++ b/win2008r2-datacenter-ssh.json @@ -168,7 +168,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-datacenter.json b/win2008r2-datacenter.json index d2f02088..20849762 100644 --- a/win2008r2-datacenter.json +++ b/win2008r2-datacenter.json @@ -163,7 +163,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-enterprise-cygwin.json b/win2008r2-enterprise-cygwin.json index e7c97346..134bfcc2 100644 --- a/win2008r2-enterprise-cygwin.json +++ b/win2008r2-enterprise-cygwin.json @@ -172,7 +172,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-enterprise-ssh.json b/win2008r2-enterprise-ssh.json index 8bfbaff1..e14505e9 100644 --- a/win2008r2-enterprise-ssh.json +++ b/win2008r2-enterprise-ssh.json @@ -168,7 +168,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-enterprise.json b/win2008r2-enterprise.json index 3968b567..43093b51 100644 --- a/win2008r2-enterprise.json +++ b/win2008r2-enterprise.json @@ -163,7 +163,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-standard-cygwin.json b/win2008r2-standard-cygwin.json index 4d381fae..840b4130 100644 --- a/win2008r2-standard-cygwin.json +++ b/win2008r2-standard-cygwin.json @@ -172,7 +172,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-standard-ssh.json b/win2008r2-standard-ssh.json index af9a1d44..006e88d0 100644 --- a/win2008r2-standard-ssh.json +++ b/win2008r2-standard-ssh.json @@ -168,7 +168,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-standard.json b/win2008r2-standard.json index 7fc0db3c..a212007d 100644 --- a/win2008r2-standard.json +++ b/win2008r2-standard.json @@ -163,7 +163,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-web-cygwin.json b/win2008r2-web-cygwin.json index d8fab91a..63d0fc35 100644 --- a/win2008r2-web-cygwin.json +++ b/win2008r2-web-cygwin.json @@ -172,7 +172,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-web-ssh.json b/win2008r2-web-ssh.json index c5b84509..ed1ec742 100644 --- a/win2008r2-web-ssh.json +++ b/win2008r2-web-ssh.json @@ -168,7 +168,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-web.json b/win2008r2-web.json index e3af4dde..9623a8bf 100644 --- a/win2008r2-web.json +++ b/win2008r2-web.json @@ -163,7 +163,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012-datacenter-cygwin.json b/win2012-datacenter-cygwin.json index 734ce110..13376553 100644 --- a/win2012-datacenter-cygwin.json +++ b/win2012-datacenter-cygwin.json @@ -184,7 +184,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012-datacenter-ssh.json b/win2012-datacenter-ssh.json index ab28e88e..f966dd47 100644 --- a/win2012-datacenter-ssh.json +++ b/win2012-datacenter-ssh.json @@ -180,7 +180,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012-datacenter.json b/win2012-datacenter.json index 7d07bf12..31bb6512 100644 --- a/win2012-datacenter.json +++ b/win2012-datacenter.json @@ -175,7 +175,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012-standard-cygwin.json b/win2012-standard-cygwin.json index c9d18613..894ac50a 100644 --- a/win2012-standard-cygwin.json +++ b/win2012-standard-cygwin.json @@ -184,7 +184,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012-standard-ssh.json b/win2012-standard-ssh.json index 2ba4aa70..84e99f23 100644 --- a/win2012-standard-ssh.json +++ b/win2012-standard-ssh.json @@ -180,7 +180,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012-standard.json b/win2012-standard.json index c1598f74..9413101d 100644 --- a/win2012-standard.json +++ b/win2012-standard.json @@ -175,7 +175,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-datacenter-cygwin.json b/win2012r2-datacenter-cygwin.json index 72ac596a..a315271b 100644 --- a/win2012r2-datacenter-cygwin.json +++ b/win2012r2-datacenter-cygwin.json @@ -185,7 +185,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-datacenter-ssh.json b/win2012r2-datacenter-ssh.json index a70a581d..51be77c2 100644 --- a/win2012r2-datacenter-ssh.json +++ b/win2012r2-datacenter-ssh.json @@ -181,7 +181,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-datacenter.json b/win2012r2-datacenter.json index ef48fb1d..7db95309 100644 --- a/win2012r2-datacenter.json +++ b/win2012r2-datacenter.json @@ -176,7 +176,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-standard-cygwin.json b/win2012r2-standard-cygwin.json index 8c8b1bb3..2913e7b2 100644 --- a/win2012r2-standard-cygwin.json +++ b/win2012r2-standard-cygwin.json @@ -185,7 +185,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-standard-ssh.json b/win2012r2-standard-ssh.json index 57f3d499..e679212b 100644 --- a/win2012r2-standard-ssh.json +++ b/win2012r2-standard-ssh.json @@ -181,7 +181,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-standard.json b/win2012r2-standard.json index 25e672cc..d1655cda 100644 --- a/win2012r2-standard.json +++ b/win2012r2-standard.json @@ -176,7 +176,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-standardcore-cygwin.json b/win2012r2-standardcore-cygwin.json index 3e4084dc..0ed1f363 100644 --- a/win2012r2-standardcore-cygwin.json +++ b/win2012r2-standardcore-cygwin.json @@ -185,7 +185,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-standardcore-ssh.json b/win2012r2-standardcore-ssh.json index 8b825327..7d558be6 100644 --- a/win2012r2-standardcore-ssh.json +++ b/win2012r2-standardcore-ssh.json @@ -181,7 +181,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-standardcore.json b/win2012r2-standardcore.json index c643550f..52e244a2 100644 --- a/win2012r2-standardcore.json +++ b/win2012r2-standardcore.json @@ -176,7 +176,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2016-standard-cygwin.json b/win2016-standard-cygwin.json index ebb635a0..dd67c5b0 100644 --- a/win2016-standard-cygwin.json +++ b/win2016-standard-cygwin.json @@ -189,7 +189,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2016-standard-ssh.json b/win2016-standard-ssh.json index 05049dbe..302c1839 100644 --- a/win2016-standard-ssh.json +++ b/win2016-standard-ssh.json @@ -185,7 +185,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2016-standard.json b/win2016-standard.json index 905b0bd1..e38a4749 100644 --- a/win2016-standard.json +++ b/win2016-standard.json @@ -181,7 +181,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x64-enterprise-cygwin.json b/win7x64-enterprise-cygwin.json index 527ed9e9..2b944238 100644 --- a/win7x64-enterprise-cygwin.json +++ b/win7x64-enterprise-cygwin.json @@ -176,7 +176,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x64-enterprise-ssh.json b/win7x64-enterprise-ssh.json index eceb5aa1..340687d0 100644 --- a/win7x64-enterprise-ssh.json +++ b/win7x64-enterprise-ssh.json @@ -172,7 +172,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x64-enterprise.json b/win7x64-enterprise.json index f05fefc3..bc271274 100644 --- a/win7x64-enterprise.json +++ b/win7x64-enterprise.json @@ -163,7 +163,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x64-pro-cygwin.json b/win7x64-pro-cygwin.json index bdee59fe..04836f4c 100644 --- a/win7x64-pro-cygwin.json +++ b/win7x64-pro-cygwin.json @@ -176,7 +176,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x64-pro-ssh.json b/win7x64-pro-ssh.json index f3001d30..9f0fffed 100644 --- a/win7x64-pro-ssh.json +++ b/win7x64-pro-ssh.json @@ -172,7 +172,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x64-pro.json b/win7x64-pro.json index ccd41d23..134b04db 100644 --- a/win7x64-pro.json +++ b/win7x64-pro.json @@ -163,7 +163,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x86-enterprise-cygwin.json b/win7x86-enterprise-cygwin.json index 74dfb4f6..3427a30e 100644 --- a/win7x86-enterprise-cygwin.json +++ b/win7x86-enterprise-cygwin.json @@ -176,7 +176,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x86-enterprise-ssh.json b/win7x86-enterprise-ssh.json index fddf6198..53ae88d8 100644 --- a/win7x86-enterprise-ssh.json +++ b/win7x86-enterprise-ssh.json @@ -172,7 +172,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x86-enterprise.json b/win7x86-enterprise.json index a73583a1..410d5082 100644 --- a/win7x86-enterprise.json +++ b/win7x86-enterprise.json @@ -163,7 +163,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x86-pro-cygwin.json b/win7x86-pro-cygwin.json index c7756aa4..56677d76 100644 --- a/win7x86-pro-cygwin.json +++ b/win7x86-pro-cygwin.json @@ -176,7 +176,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x86-pro-ssh.json b/win7x86-pro-ssh.json index 23302b47..9a4b3509 100644 --- a/win7x86-pro-ssh.json +++ b/win7x86-pro-ssh.json @@ -172,7 +172,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x86-pro.json b/win7x86-pro.json index ba2851f3..600bc8b6 100644 --- a/win7x86-pro.json +++ b/win7x86-pro.json @@ -163,7 +163,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x64-enterprise-cygwin.json b/win81x64-enterprise-cygwin.json index f37fcdf4..666e686c 100644 --- a/win81x64-enterprise-cygwin.json +++ b/win81x64-enterprise-cygwin.json @@ -177,7 +177,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x64-enterprise-ssh.json b/win81x64-enterprise-ssh.json index bf31c6c6..d132c66d 100644 --- a/win81x64-enterprise-ssh.json +++ b/win81x64-enterprise-ssh.json @@ -173,7 +173,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x64-enterprise.json b/win81x64-enterprise.json index ca322da1..5b33b5ca 100644 --- a/win81x64-enterprise.json +++ b/win81x64-enterprise.json @@ -168,7 +168,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x64-pro-cygwin.json b/win81x64-pro-cygwin.json index 7837a6fb..4277feed 100644 --- a/win81x64-pro-cygwin.json +++ b/win81x64-pro-cygwin.json @@ -177,7 +177,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x64-pro-ssh.json b/win81x64-pro-ssh.json index 691ffcfb..c2646ded 100644 --- a/win81x64-pro-ssh.json +++ b/win81x64-pro-ssh.json @@ -173,7 +173,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x64-pro.json b/win81x64-pro.json index a61a0abb..8b891549 100644 --- a/win81x64-pro.json +++ b/win81x64-pro.json @@ -168,7 +168,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x86-enterprise-cygwin.json b/win81x86-enterprise-cygwin.json index 9333ea2f..b30444b5 100644 --- a/win81x86-enterprise-cygwin.json +++ b/win81x86-enterprise-cygwin.json @@ -169,7 +169,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x86-enterprise-ssh.json b/win81x86-enterprise-ssh.json index cec6f465..d2c7d929 100644 --- a/win81x86-enterprise-ssh.json +++ b/win81x86-enterprise-ssh.json @@ -165,7 +165,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x86-enterprise.json b/win81x86-enterprise.json index 843a6780..2f548268 100644 --- a/win81x86-enterprise.json +++ b/win81x86-enterprise.json @@ -160,7 +160,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x86-pro-cygwin.json b/win81x86-pro-cygwin.json index d377191c..41a93588 100644 --- a/win81x86-pro-cygwin.json +++ b/win81x86-pro-cygwin.json @@ -169,7 +169,10 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x86-pro-ssh.json b/win81x86-pro-ssh.json index 8e80286a..1290afbc 100644 --- a/win81x86-pro-ssh.json +++ b/win81x86-pro-ssh.json @@ -165,7 +165,10 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x86-pro.json b/win81x86-pro.json index 5600a8d1..f5aa0bfe 100644 --- a/win81x86-pro.json +++ b/win81x86-pro.json @@ -160,7 +160,10 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2", + "cpus": "2",, + "http_proxy={{env `http_proxy`}}", + "https_proxy={{env `https_proxy`}}", + "no_proxy={{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", From bb1dffa7f21038a0d465a7a0ecc7c8fa676315c1 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Mon, 24 Feb 2020 15:26:20 -0500 Subject: [PATCH 05/13] add proxy env vars to variables --- eval-win10x64-enterprise-cygwin.json | 6 +++--- eval-win10x64-enterprise-ssh.json | 6 +++--- eval-win10x64-enterprise.json | 6 +++--- eval-win10x86-enterprise-cygwin.json | 6 +++--- eval-win10x86-enterprise-ssh.json | 6 +++--- eval-win10x86-enterprise.json | 6 +++--- eval-win2008r2-datacenter-cygwin.json | 6 +++--- eval-win2008r2-datacenter-ssh.json | 6 +++--- eval-win2008r2-datacenter.json | 6 +++--- eval-win2008r2-standard-cygwin.json | 6 +++--- eval-win2008r2-standard-ssh.json | 6 +++--- eval-win2008r2-standard.json | 6 +++--- eval-win2012r2-datacenter-cygwin.json | 6 +++--- eval-win2012r2-datacenter-ssh.json | 6 +++--- eval-win2012r2-datacenter.json | 6 +++--- eval-win2012r2-standard-cygwin.json | 6 +++--- eval-win2012r2-standard-ssh.json | 6 +++--- eval-win2012r2-standard.json | 6 +++--- eval-win2016-standard-cygwin.json | 6 +++--- eval-win2016-standard-ssh.json | 6 +++--- eval-win2016-standard.json | 6 +++--- eval-win7x64-enterprise-cygwin.json | 6 +++--- eval-win7x64-enterprise-ssh.json | 6 +++--- eval-win7x64-enterprise.json | 6 +++--- eval-win7x86-enterprise-cygwin.json | 6 +++--- eval-win7x86-enterprise-ssh.json | 6 +++--- eval-win7x86-enterprise.json | 6 +++--- eval-win81x64-enterprise-cygwin.json | 6 +++--- eval-win81x64-enterprise-ssh.json | 6 +++--- eval-win81x64-enterprise.json | 6 +++--- eval-win81x86-enterprise-cygwin.json | 6 +++--- eval-win81x86-enterprise-ssh.json | 6 +++--- eval-win81x86-enterprise.json | 6 +++--- win2008r2-datacenter-cygwin.json | 6 +++--- win2008r2-datacenter-ssh.json | 6 +++--- win2008r2-datacenter.json | 6 +++--- win2008r2-enterprise-cygwin.json | 6 +++--- win2008r2-enterprise-ssh.json | 6 +++--- win2008r2-enterprise.json | 6 +++--- win2008r2-standard-cygwin.json | 6 +++--- win2008r2-standard-ssh.json | 6 +++--- win2008r2-standard.json | 6 +++--- win2008r2-web-cygwin.json | 6 +++--- win2008r2-web-ssh.json | 6 +++--- win2008r2-web.json | 6 +++--- win2012-datacenter-cygwin.json | 6 +++--- win2012-datacenter-ssh.json | 6 +++--- win2012-datacenter.json | 6 +++--- win2012-standard-cygwin.json | 6 +++--- win2012-standard-ssh.json | 6 +++--- win2012-standard.json | 6 +++--- win2012r2-datacenter-cygwin.json | 6 +++--- win2012r2-datacenter-ssh.json | 6 +++--- win2012r2-datacenter.json | 6 +++--- win2012r2-standard-cygwin.json | 6 +++--- win2012r2-standard-ssh.json | 6 +++--- win2012r2-standard.json | 6 +++--- win2012r2-standardcore-cygwin.json | 6 +++--- win2012r2-standardcore-ssh.json | 6 +++--- win2012r2-standardcore.json | 6 +++--- win2016-standard-cygwin.json | 6 +++--- win2016-standard-ssh.json | 6 +++--- win2016-standard.json | 6 +++--- win7x64-enterprise-cygwin.json | 6 +++--- win7x64-enterprise-ssh.json | 6 +++--- win7x64-enterprise.json | 6 +++--- win7x64-pro-cygwin.json | 6 +++--- win7x64-pro-ssh.json | 6 +++--- win7x64-pro.json | 6 +++--- win7x86-enterprise-cygwin.json | 6 +++--- win7x86-enterprise-ssh.json | 6 +++--- win7x86-enterprise.json | 6 +++--- win7x86-pro-cygwin.json | 6 +++--- win7x86-pro-ssh.json | 6 +++--- win7x86-pro.json | 6 +++--- win81x64-enterprise-cygwin.json | 6 +++--- win81x64-enterprise-ssh.json | 6 +++--- win81x64-enterprise.json | 6 +++--- win81x64-pro-cygwin.json | 6 +++--- win81x64-pro-ssh.json | 6 +++--- win81x64-pro.json | 6 +++--- win81x86-enterprise-cygwin.json | 6 +++--- win81x86-enterprise-ssh.json | 6 +++--- win81x86-enterprise.json | 6 +++--- win81x86-pro-cygwin.json | 6 +++--- win81x86-pro-ssh.json | 6 +++--- win81x86-pro.json | 6 +++--- 87 files changed, 261 insertions(+), 261 deletions(-) diff --git a/eval-win10x64-enterprise-cygwin.json b/eval-win10x64-enterprise-cygwin.json index bd060960..c2db1a2e 100644 --- a/eval-win10x64-enterprise-cygwin.json +++ b/eval-win10x64-enterprise-cygwin.json @@ -202,9 +202,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win10x64-enterprise-ssh.json b/eval-win10x64-enterprise-ssh.json index aabd8946..ed5c2eeb 100644 --- a/eval-win10x64-enterprise-ssh.json +++ b/eval-win10x64-enterprise-ssh.json @@ -198,9 +198,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win10x64-enterprise.json b/eval-win10x64-enterprise.json index 93bfe21a..403a590a 100644 --- a/eval-win10x64-enterprise.json +++ b/eval-win10x64-enterprise.json @@ -190,9 +190,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win10x86-enterprise-cygwin.json b/eval-win10x86-enterprise-cygwin.json index e6a2e8d2..e53e10d8 100644 --- a/eval-win10x86-enterprise-cygwin.json +++ b/eval-win10x86-enterprise-cygwin.json @@ -202,9 +202,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win10x86-enterprise-ssh.json b/eval-win10x86-enterprise-ssh.json index 14b6e5a4..aea40131 100644 --- a/eval-win10x86-enterprise-ssh.json +++ b/eval-win10x86-enterprise-ssh.json @@ -198,9 +198,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win10x86-enterprise.json b/eval-win10x86-enterprise.json index 1e326174..402b0b5f 100644 --- a/eval-win10x86-enterprise.json +++ b/eval-win10x86-enterprise.json @@ -190,9 +190,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-datacenter-cygwin.json b/eval-win2008r2-datacenter-cygwin.json index 01ff0346..5275cf6f 100644 --- a/eval-win2008r2-datacenter-cygwin.json +++ b/eval-win2008r2-datacenter-cygwin.json @@ -173,9 +173,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-datacenter-ssh.json b/eval-win2008r2-datacenter-ssh.json index a7b68feb..bee683d8 100644 --- a/eval-win2008r2-datacenter-ssh.json +++ b/eval-win2008r2-datacenter-ssh.json @@ -173,9 +173,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-datacenter.json b/eval-win2008r2-datacenter.json index a7b7d301..cd9a4492 100644 --- a/eval-win2008r2-datacenter.json +++ b/eval-win2008r2-datacenter.json @@ -169,9 +169,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-standard-cygwin.json b/eval-win2008r2-standard-cygwin.json index 47acf31b..cbaa5730 100644 --- a/eval-win2008r2-standard-cygwin.json +++ b/eval-win2008r2-standard-cygwin.json @@ -173,9 +173,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-standard-ssh.json b/eval-win2008r2-standard-ssh.json index bc11cc78..87a8bff7 100644 --- a/eval-win2008r2-standard-ssh.json +++ b/eval-win2008r2-standard-ssh.json @@ -169,9 +169,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-standard.json b/eval-win2008r2-standard.json index 1167ac1e..ececc528 100644 --- a/eval-win2008r2-standard.json +++ b/eval-win2008r2-standard.json @@ -165,9 +165,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-datacenter-cygwin.json b/eval-win2012r2-datacenter-cygwin.json index ad5bbc2b..484e9895 100644 --- a/eval-win2012r2-datacenter-cygwin.json +++ b/eval-win2012r2-datacenter-cygwin.json @@ -190,9 +190,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-datacenter-ssh.json b/eval-win2012r2-datacenter-ssh.json index 867d381b..c3f8cd62 100644 --- a/eval-win2012r2-datacenter-ssh.json +++ b/eval-win2012r2-datacenter-ssh.json @@ -186,9 +186,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-datacenter.json b/eval-win2012r2-datacenter.json index a3aaf796..fe50747b 100644 --- a/eval-win2012r2-datacenter.json +++ b/eval-win2012r2-datacenter.json @@ -182,9 +182,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-standard-cygwin.json b/eval-win2012r2-standard-cygwin.json index 669ee796..4c7310d8 100644 --- a/eval-win2012r2-standard-cygwin.json +++ b/eval-win2012r2-standard-cygwin.json @@ -190,9 +190,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-standard-ssh.json b/eval-win2012r2-standard-ssh.json index d1a8260b..b8307d76 100644 --- a/eval-win2012r2-standard-ssh.json +++ b/eval-win2012r2-standard-ssh.json @@ -186,9 +186,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-standard.json b/eval-win2012r2-standard.json index 1b961a44..db5142c9 100644 --- a/eval-win2012r2-standard.json +++ b/eval-win2012r2-standard.json @@ -182,9 +182,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2016-standard-cygwin.json b/eval-win2016-standard-cygwin.json index f55e15d6..e8f29f5a 100644 --- a/eval-win2016-standard-cygwin.json +++ b/eval-win2016-standard-cygwin.json @@ -190,9 +190,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2016-standard-ssh.json b/eval-win2016-standard-ssh.json index 98305a96..2d12313c 100644 --- a/eval-win2016-standard-ssh.json +++ b/eval-win2016-standard-ssh.json @@ -186,9 +186,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2016-standard.json b/eval-win2016-standard.json index b36b3838..07264dd0 100644 --- a/eval-win2016-standard.json +++ b/eval-win2016-standard.json @@ -182,9 +182,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x64-enterprise-cygwin.json b/eval-win7x64-enterprise-cygwin.json index 20ec430b..f46a1b46 100644 --- a/eval-win7x64-enterprise-cygwin.json +++ b/eval-win7x64-enterprise-cygwin.json @@ -181,9 +181,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "3072", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x64-enterprise-ssh.json b/eval-win7x64-enterprise-ssh.json index 06b002de..bd8dc5b9 100644 --- a/eval-win7x64-enterprise-ssh.json +++ b/eval-win7x64-enterprise-ssh.json @@ -181,9 +181,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "3072", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x64-enterprise.json b/eval-win7x64-enterprise.json index 64bab509..54c02f5a 100644 --- a/eval-win7x64-enterprise.json +++ b/eval-win7x64-enterprise.json @@ -173,9 +173,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "3072", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x86-enterprise-cygwin.json b/eval-win7x86-enterprise-cygwin.json index 6463eb73..50edcbb4 100644 --- a/eval-win7x86-enterprise-cygwin.json +++ b/eval-win7x86-enterprise-cygwin.json @@ -181,9 +181,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x86-enterprise-ssh.json b/eval-win7x86-enterprise-ssh.json index ec3d3b43..844ac37e 100644 --- a/eval-win7x86-enterprise-ssh.json +++ b/eval-win7x86-enterprise-ssh.json @@ -177,9 +177,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x86-enterprise.json b/eval-win7x86-enterprise.json index a0aead3e..52713503 100644 --- a/eval-win7x86-enterprise.json +++ b/eval-win7x86-enterprise.json @@ -169,9 +169,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x64-enterprise-cygwin.json b/eval-win81x64-enterprise-cygwin.json index f4878e9e..7d12d81f 100644 --- a/eval-win81x64-enterprise-cygwin.json +++ b/eval-win81x64-enterprise-cygwin.json @@ -182,9 +182,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x64-enterprise-ssh.json b/eval-win81x64-enterprise-ssh.json index 184a4aaf..e74f1056 100644 --- a/eval-win81x64-enterprise-ssh.json +++ b/eval-win81x64-enterprise-ssh.json @@ -182,9 +182,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x64-enterprise.json b/eval-win81x64-enterprise.json index 1c3b8bbc..bde3950d 100644 --- a/eval-win81x64-enterprise.json +++ b/eval-win81x64-enterprise.json @@ -178,9 +178,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x86-enterprise-cygwin.json b/eval-win81x86-enterprise-cygwin.json index a2f0b1d1..746ba5d0 100644 --- a/eval-win81x86-enterprise-cygwin.json +++ b/eval-win81x86-enterprise-cygwin.json @@ -182,9 +182,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x86-enterprise-ssh.json b/eval-win81x86-enterprise-ssh.json index 8e24cdc4..7e64aa6f 100644 --- a/eval-win81x86-enterprise-ssh.json +++ b/eval-win81x86-enterprise-ssh.json @@ -178,9 +178,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x86-enterprise.json b/eval-win81x86-enterprise.json index 42ea29ac..7d7e7518 100644 --- a/eval-win81x86-enterprise.json +++ b/eval-win81x86-enterprise.json @@ -174,9 +174,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-datacenter-cygwin.json b/win2008r2-datacenter-cygwin.json index c91a1f78..72efab3a 100644 --- a/win2008r2-datacenter-cygwin.json +++ b/win2008r2-datacenter-cygwin.json @@ -173,9 +173,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-datacenter-ssh.json b/win2008r2-datacenter-ssh.json index 0e5137fe..dd0febbb 100644 --- a/win2008r2-datacenter-ssh.json +++ b/win2008r2-datacenter-ssh.json @@ -169,9 +169,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-datacenter.json b/win2008r2-datacenter.json index 20849762..440af37d 100644 --- a/win2008r2-datacenter.json +++ b/win2008r2-datacenter.json @@ -164,9 +164,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-enterprise-cygwin.json b/win2008r2-enterprise-cygwin.json index 134bfcc2..e4253fa1 100644 --- a/win2008r2-enterprise-cygwin.json +++ b/win2008r2-enterprise-cygwin.json @@ -173,9 +173,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-enterprise-ssh.json b/win2008r2-enterprise-ssh.json index e14505e9..5664abf6 100644 --- a/win2008r2-enterprise-ssh.json +++ b/win2008r2-enterprise-ssh.json @@ -169,9 +169,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-enterprise.json b/win2008r2-enterprise.json index 43093b51..154a8f64 100644 --- a/win2008r2-enterprise.json +++ b/win2008r2-enterprise.json @@ -164,9 +164,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-standard-cygwin.json b/win2008r2-standard-cygwin.json index 840b4130..fabe3c16 100644 --- a/win2008r2-standard-cygwin.json +++ b/win2008r2-standard-cygwin.json @@ -173,9 +173,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-standard-ssh.json b/win2008r2-standard-ssh.json index 006e88d0..7ed41398 100644 --- a/win2008r2-standard-ssh.json +++ b/win2008r2-standard-ssh.json @@ -169,9 +169,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-standard.json b/win2008r2-standard.json index a212007d..7879f01d 100644 --- a/win2008r2-standard.json +++ b/win2008r2-standard.json @@ -164,9 +164,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-web-cygwin.json b/win2008r2-web-cygwin.json index 63d0fc35..b9ac2905 100644 --- a/win2008r2-web-cygwin.json +++ b/win2008r2-web-cygwin.json @@ -173,9 +173,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-web-ssh.json b/win2008r2-web-ssh.json index ed1ec742..ab9839a2 100644 --- a/win2008r2-web-ssh.json +++ b/win2008r2-web-ssh.json @@ -169,9 +169,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2008r2-web.json b/win2008r2-web.json index 9623a8bf..dff6173d 100644 --- a/win2008r2-web.json +++ b/win2008r2-web.json @@ -164,9 +164,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012-datacenter-cygwin.json b/win2012-datacenter-cygwin.json index 13376553..803a2325 100644 --- a/win2012-datacenter-cygwin.json +++ b/win2012-datacenter-cygwin.json @@ -185,9 +185,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012-datacenter-ssh.json b/win2012-datacenter-ssh.json index f966dd47..b1d91d19 100644 --- a/win2012-datacenter-ssh.json +++ b/win2012-datacenter-ssh.json @@ -181,9 +181,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012-datacenter.json b/win2012-datacenter.json index 31bb6512..2e2a8ff7 100644 --- a/win2012-datacenter.json +++ b/win2012-datacenter.json @@ -176,9 +176,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012-standard-cygwin.json b/win2012-standard-cygwin.json index 894ac50a..5c369856 100644 --- a/win2012-standard-cygwin.json +++ b/win2012-standard-cygwin.json @@ -185,9 +185,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012-standard-ssh.json b/win2012-standard-ssh.json index 84e99f23..deb50d1d 100644 --- a/win2012-standard-ssh.json +++ b/win2012-standard-ssh.json @@ -181,9 +181,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012-standard.json b/win2012-standard.json index 9413101d..7d268a99 100644 --- a/win2012-standard.json +++ b/win2012-standard.json @@ -176,9 +176,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-datacenter-cygwin.json b/win2012r2-datacenter-cygwin.json index a315271b..bbf90c75 100644 --- a/win2012r2-datacenter-cygwin.json +++ b/win2012r2-datacenter-cygwin.json @@ -186,9 +186,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-datacenter-ssh.json b/win2012r2-datacenter-ssh.json index 51be77c2..7ed55bb3 100644 --- a/win2012r2-datacenter-ssh.json +++ b/win2012r2-datacenter-ssh.json @@ -182,9 +182,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-datacenter.json b/win2012r2-datacenter.json index 7db95309..bdfe6477 100644 --- a/win2012r2-datacenter.json +++ b/win2012r2-datacenter.json @@ -177,9 +177,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-standard-cygwin.json b/win2012r2-standard-cygwin.json index 2913e7b2..52e16d0f 100644 --- a/win2012r2-standard-cygwin.json +++ b/win2012r2-standard-cygwin.json @@ -186,9 +186,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-standard-ssh.json b/win2012r2-standard-ssh.json index e679212b..c185e0d5 100644 --- a/win2012r2-standard-ssh.json +++ b/win2012r2-standard-ssh.json @@ -182,9 +182,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-standard.json b/win2012r2-standard.json index d1655cda..b2593cdc 100644 --- a/win2012r2-standard.json +++ b/win2012r2-standard.json @@ -177,9 +177,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-standardcore-cygwin.json b/win2012r2-standardcore-cygwin.json index 0ed1f363..fad47a27 100644 --- a/win2012r2-standardcore-cygwin.json +++ b/win2012r2-standardcore-cygwin.json @@ -186,9 +186,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-standardcore-ssh.json b/win2012r2-standardcore-ssh.json index 7d558be6..ff09a0db 100644 --- a/win2012r2-standardcore-ssh.json +++ b/win2012r2-standardcore-ssh.json @@ -182,9 +182,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2012r2-standardcore.json b/win2012r2-standardcore.json index 52e244a2..345c2628 100644 --- a/win2012r2-standardcore.json +++ b/win2012r2-standardcore.json @@ -177,9 +177,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2016-standard-cygwin.json b/win2016-standard-cygwin.json index dd67c5b0..9f5a74f8 100644 --- a/win2016-standard-cygwin.json +++ b/win2016-standard-cygwin.json @@ -190,9 +190,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2016-standard-ssh.json b/win2016-standard-ssh.json index 302c1839..58eb38f1 100644 --- a/win2016-standard-ssh.json +++ b/win2016-standard-ssh.json @@ -186,9 +186,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win2016-standard.json b/win2016-standard.json index e38a4749..24ab6f52 100644 --- a/win2016-standard.json +++ b/win2016-standard.json @@ -182,9 +182,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x64-enterprise-cygwin.json b/win7x64-enterprise-cygwin.json index 2b944238..d00ed62c 100644 --- a/win7x64-enterprise-cygwin.json +++ b/win7x64-enterprise-cygwin.json @@ -177,9 +177,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x64-enterprise-ssh.json b/win7x64-enterprise-ssh.json index 340687d0..5625e002 100644 --- a/win7x64-enterprise-ssh.json +++ b/win7x64-enterprise-ssh.json @@ -173,9 +173,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x64-enterprise.json b/win7x64-enterprise.json index bc271274..60a16fd7 100644 --- a/win7x64-enterprise.json +++ b/win7x64-enterprise.json @@ -164,9 +164,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x64-pro-cygwin.json b/win7x64-pro-cygwin.json index 04836f4c..dad6f799 100644 --- a/win7x64-pro-cygwin.json +++ b/win7x64-pro-cygwin.json @@ -177,9 +177,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x64-pro-ssh.json b/win7x64-pro-ssh.json index 9f0fffed..02838659 100644 --- a/win7x64-pro-ssh.json +++ b/win7x64-pro-ssh.json @@ -173,9 +173,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x64-pro.json b/win7x64-pro.json index 134b04db..d1cd2e44 100644 --- a/win7x64-pro.json +++ b/win7x64-pro.json @@ -164,9 +164,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x86-enterprise-cygwin.json b/win7x86-enterprise-cygwin.json index 3427a30e..3e2b9206 100644 --- a/win7x86-enterprise-cygwin.json +++ b/win7x86-enterprise-cygwin.json @@ -177,9 +177,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x86-enterprise-ssh.json b/win7x86-enterprise-ssh.json index 53ae88d8..cb91de8a 100644 --- a/win7x86-enterprise-ssh.json +++ b/win7x86-enterprise-ssh.json @@ -173,9 +173,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x86-enterprise.json b/win7x86-enterprise.json index 410d5082..4c345a65 100644 --- a/win7x86-enterprise.json +++ b/win7x86-enterprise.json @@ -164,9 +164,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x86-pro-cygwin.json b/win7x86-pro-cygwin.json index 56677d76..62111c87 100644 --- a/win7x86-pro-cygwin.json +++ b/win7x86-pro-cygwin.json @@ -177,9 +177,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x86-pro-ssh.json b/win7x86-pro-ssh.json index 9a4b3509..1f64451c 100644 --- a/win7x86-pro-ssh.json +++ b/win7x86-pro-ssh.json @@ -173,9 +173,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win7x86-pro.json b/win7x86-pro.json index 600bc8b6..edb7083c 100644 --- a/win7x86-pro.json +++ b/win7x86-pro.json @@ -164,9 +164,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x64-enterprise-cygwin.json b/win81x64-enterprise-cygwin.json index 666e686c..35b4909c 100644 --- a/win81x64-enterprise-cygwin.json +++ b/win81x64-enterprise-cygwin.json @@ -178,9 +178,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x64-enterprise-ssh.json b/win81x64-enterprise-ssh.json index d132c66d..493dd2cb 100644 --- a/win81x64-enterprise-ssh.json +++ b/win81x64-enterprise-ssh.json @@ -174,9 +174,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x64-enterprise.json b/win81x64-enterprise.json index 5b33b5ca..e267b2bc 100644 --- a/win81x64-enterprise.json +++ b/win81x64-enterprise.json @@ -169,9 +169,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x64-pro-cygwin.json b/win81x64-pro-cygwin.json index 4277feed..5ff44fb2 100644 --- a/win81x64-pro-cygwin.json +++ b/win81x64-pro-cygwin.json @@ -178,9 +178,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x64-pro-ssh.json b/win81x64-pro-ssh.json index c2646ded..5f632840 100644 --- a/win81x64-pro-ssh.json +++ b/win81x64-pro-ssh.json @@ -174,9 +174,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x64-pro.json b/win81x64-pro.json index 8b891549..f712cac8 100644 --- a/win81x64-pro.json +++ b/win81x64-pro.json @@ -169,9 +169,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x86-enterprise-cygwin.json b/win81x86-enterprise-cygwin.json index b30444b5..684d8b2c 100644 --- a/win81x86-enterprise-cygwin.json +++ b/win81x86-enterprise-cygwin.json @@ -170,9 +170,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x86-enterprise-ssh.json b/win81x86-enterprise-ssh.json index d2c7d929..634f9591 100644 --- a/win81x86-enterprise-ssh.json +++ b/win81x86-enterprise-ssh.json @@ -166,9 +166,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x86-enterprise.json b/win81x86-enterprise.json index 2f548268..a2bb9345 100644 --- a/win81x86-enterprise.json +++ b/win81x86-enterprise.json @@ -161,9 +161,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x86-pro-cygwin.json b/win81x86-pro-cygwin.json index 41a93588..7596822d 100644 --- a/win81x86-pro-cygwin.json +++ b/win81x86-pro-cygwin.json @@ -170,9 +170,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x86-pro-ssh.json b/win81x86-pro-ssh.json index 1290afbc..6237f815 100644 --- a/win81x86-pro-ssh.json +++ b/win81x86-pro-ssh.json @@ -166,9 +166,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/win81x86-pro.json b/win81x86-pro.json index f5aa0bfe..af1bad61 100644 --- a/win81x86-pro.json +++ b/win81x86-pro.json @@ -161,9 +161,9 @@ "cm": "chef", "cm_version": "", "cpus": "2",, - "http_proxy={{env `http_proxy`}}", - "https_proxy={{env `https_proxy`}}", - "no_proxy={{env `no_proxy`}}", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", From 67c5e39dd483b525fc7805b4d39dcebeebb5a18e Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Mon, 24 Feb 2020 16:35:29 -0500 Subject: [PATCH 06/13] add proxy env vars to variables --- eval-win10x64-enterprise-cygwin.json | 2 +- eval-win10x64-enterprise-ssh.json | 2 +- eval-win10x64-enterprise.json | 2 +- eval-win10x86-enterprise-cygwin.json | 2 +- eval-win10x86-enterprise-ssh.json | 2 +- eval-win10x86-enterprise.json | 2 +- eval-win2008r2-datacenter-cygwin.json | 2 +- eval-win2008r2-datacenter-ssh.json | 2 +- eval-win2008r2-datacenter.json | 2 +- eval-win2008r2-standard-cygwin.json | 2 +- eval-win2008r2-standard-ssh.json | 2 +- eval-win2008r2-standard.json | 2 +- eval-win2012r2-datacenter-cygwin.json | 2 +- eval-win2012r2-datacenter-ssh.json | 2 +- eval-win2012r2-datacenter.json | 2 +- eval-win2012r2-standard-cygwin.json | 2 +- eval-win2012r2-standard-ssh.json | 2 +- eval-win2012r2-standard.json | 2 +- eval-win2016-standard-cygwin.json | 2 +- eval-win2016-standard-ssh.json | 2 +- eval-win2016-standard.json | 2 +- eval-win7x64-enterprise-cygwin.json | 2 +- eval-win7x64-enterprise-ssh.json | 2 +- eval-win7x64-enterprise.json | 2 +- eval-win7x86-enterprise-cygwin.json | 2 +- eval-win7x86-enterprise-ssh.json | 2 +- eval-win7x86-enterprise.json | 2 +- eval-win81x64-enterprise-cygwin.json | 2 +- eval-win81x64-enterprise-ssh.json | 2 +- eval-win81x64-enterprise.json | 2 +- eval-win81x86-enterprise-cygwin.json | 2 +- eval-win81x86-enterprise-ssh.json | 2 +- eval-win81x86-enterprise.json | 2 +- win2008r2-datacenter-cygwin.json | 2 +- win2008r2-datacenter-ssh.json | 2 +- win2008r2-datacenter.json | 2 +- win2008r2-enterprise-cygwin.json | 2 +- win2008r2-enterprise-ssh.json | 2 +- win2008r2-enterprise.json | 2 +- win2008r2-standard-cygwin.json | 2 +- win2008r2-standard-ssh.json | 2 +- win2008r2-standard.json | 2 +- win2008r2-web-cygwin.json | 2 +- win2008r2-web-ssh.json | 2 +- win2008r2-web.json | 2 +- win2012-datacenter-cygwin.json | 2 +- win2012-datacenter-ssh.json | 2 +- win2012-datacenter.json | 2 +- win2012-standard-cygwin.json | 2 +- win2012-standard-ssh.json | 2 +- win2012-standard.json | 2 +- win2012r2-datacenter-cygwin.json | 2 +- win2012r2-datacenter-ssh.json | 2 +- win2012r2-datacenter.json | 2 +- win2012r2-standard-cygwin.json | 2 +- win2012r2-standard-ssh.json | 2 +- win2012r2-standard.json | 2 +- win2012r2-standardcore-cygwin.json | 2 +- win2012r2-standardcore-ssh.json | 2 +- win2012r2-standardcore.json | 2 +- win2016-standard-cygwin.json | 2 +- win2016-standard-ssh.json | 2 +- win2016-standard.json | 2 +- win7x64-enterprise-cygwin.json | 2 +- win7x64-enterprise-ssh.json | 2 +- win7x64-enterprise.json | 2 +- win7x64-pro-cygwin.json | 2 +- win7x64-pro-ssh.json | 2 +- win7x64-pro.json | 2 +- win7x86-enterprise-cygwin.json | 2 +- win7x86-enterprise-ssh.json | 2 +- win7x86-enterprise.json | 2 +- win7x86-pro-cygwin.json | 2 +- win7x86-pro-ssh.json | 2 +- win7x86-pro.json | 2 +- win81x64-enterprise-cygwin.json | 2 +- win81x64-enterprise-ssh.json | 2 +- win81x64-enterprise.json | 2 +- win81x64-pro-cygwin.json | 2 +- win81x64-pro-ssh.json | 2 +- win81x64-pro.json | 2 +- win81x86-enterprise-cygwin.json | 2 +- win81x86-enterprise-ssh.json | 2 +- win81x86-enterprise.json | 2 +- win81x86-pro-cygwin.json | 2 +- win81x86-pro-ssh.json | 2 +- win81x86-pro.json | 2 +- 87 files changed, 87 insertions(+), 87 deletions(-) diff --git a/eval-win10x64-enterprise-cygwin.json b/eval-win10x64-enterprise-cygwin.json index c2db1a2e..410efc8a 100644 --- a/eval-win10x64-enterprise-cygwin.json +++ b/eval-win10x64-enterprise-cygwin.json @@ -201,7 +201,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win10x64-enterprise-ssh.json b/eval-win10x64-enterprise-ssh.json index ed5c2eeb..64dd8c71 100644 --- a/eval-win10x64-enterprise-ssh.json +++ b/eval-win10x64-enterprise-ssh.json @@ -197,7 +197,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win10x64-enterprise.json b/eval-win10x64-enterprise.json index 403a590a..fda9841f 100644 --- a/eval-win10x64-enterprise.json +++ b/eval-win10x64-enterprise.json @@ -189,7 +189,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win10x86-enterprise-cygwin.json b/eval-win10x86-enterprise-cygwin.json index e53e10d8..6c465dc6 100644 --- a/eval-win10x86-enterprise-cygwin.json +++ b/eval-win10x86-enterprise-cygwin.json @@ -201,7 +201,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win10x86-enterprise-ssh.json b/eval-win10x86-enterprise-ssh.json index aea40131..a9f827d9 100644 --- a/eval-win10x86-enterprise-ssh.json +++ b/eval-win10x86-enterprise-ssh.json @@ -197,7 +197,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win10x86-enterprise.json b/eval-win10x86-enterprise.json index 402b0b5f..9f622383 100644 --- a/eval-win10x86-enterprise.json +++ b/eval-win10x86-enterprise.json @@ -189,7 +189,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win2008r2-datacenter-cygwin.json b/eval-win2008r2-datacenter-cygwin.json index 5275cf6f..01d88fc5 100644 --- a/eval-win2008r2-datacenter-cygwin.json +++ b/eval-win2008r2-datacenter-cygwin.json @@ -172,7 +172,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win2008r2-datacenter-ssh.json b/eval-win2008r2-datacenter-ssh.json index bee683d8..3fc8e642 100644 --- a/eval-win2008r2-datacenter-ssh.json +++ b/eval-win2008r2-datacenter-ssh.json @@ -172,7 +172,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win2008r2-datacenter.json b/eval-win2008r2-datacenter.json index cd9a4492..ba00e05a 100644 --- a/eval-win2008r2-datacenter.json +++ b/eval-win2008r2-datacenter.json @@ -168,7 +168,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win2008r2-standard-cygwin.json b/eval-win2008r2-standard-cygwin.json index cbaa5730..e6e312fc 100644 --- a/eval-win2008r2-standard-cygwin.json +++ b/eval-win2008r2-standard-cygwin.json @@ -172,7 +172,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win2008r2-standard-ssh.json b/eval-win2008r2-standard-ssh.json index 87a8bff7..b3f373ea 100644 --- a/eval-win2008r2-standard-ssh.json +++ b/eval-win2008r2-standard-ssh.json @@ -168,7 +168,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win2008r2-standard.json b/eval-win2008r2-standard.json index ececc528..930ca4fa 100644 --- a/eval-win2008r2-standard.json +++ b/eval-win2008r2-standard.json @@ -164,7 +164,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win2012r2-datacenter-cygwin.json b/eval-win2012r2-datacenter-cygwin.json index 484e9895..bbb1997f 100644 --- a/eval-win2012r2-datacenter-cygwin.json +++ b/eval-win2012r2-datacenter-cygwin.json @@ -189,7 +189,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win2012r2-datacenter-ssh.json b/eval-win2012r2-datacenter-ssh.json index c3f8cd62..703cf79c 100644 --- a/eval-win2012r2-datacenter-ssh.json +++ b/eval-win2012r2-datacenter-ssh.json @@ -185,7 +185,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win2012r2-datacenter.json b/eval-win2012r2-datacenter.json index fe50747b..51dd8930 100644 --- a/eval-win2012r2-datacenter.json +++ b/eval-win2012r2-datacenter.json @@ -181,7 +181,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win2012r2-standard-cygwin.json b/eval-win2012r2-standard-cygwin.json index 4c7310d8..5815caaa 100644 --- a/eval-win2012r2-standard-cygwin.json +++ b/eval-win2012r2-standard-cygwin.json @@ -189,7 +189,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win2012r2-standard-ssh.json b/eval-win2012r2-standard-ssh.json index b8307d76..4281ff52 100644 --- a/eval-win2012r2-standard-ssh.json +++ b/eval-win2012r2-standard-ssh.json @@ -185,7 +185,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win2012r2-standard.json b/eval-win2012r2-standard.json index db5142c9..e477da0b 100644 --- a/eval-win2012r2-standard.json +++ b/eval-win2012r2-standard.json @@ -181,7 +181,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win2016-standard-cygwin.json b/eval-win2016-standard-cygwin.json index e8f29f5a..4906fc3b 100644 --- a/eval-win2016-standard-cygwin.json +++ b/eval-win2016-standard-cygwin.json @@ -189,7 +189,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win2016-standard-ssh.json b/eval-win2016-standard-ssh.json index 2d12313c..c6cde591 100644 --- a/eval-win2016-standard-ssh.json +++ b/eval-win2016-standard-ssh.json @@ -185,7 +185,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win2016-standard.json b/eval-win2016-standard.json index 07264dd0..5a7bd3c1 100644 --- a/eval-win2016-standard.json +++ b/eval-win2016-standard.json @@ -181,7 +181,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win7x64-enterprise-cygwin.json b/eval-win7x64-enterprise-cygwin.json index f46a1b46..f68dc090 100644 --- a/eval-win7x64-enterprise-cygwin.json +++ b/eval-win7x64-enterprise-cygwin.json @@ -180,7 +180,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win7x64-enterprise-ssh.json b/eval-win7x64-enterprise-ssh.json index bd8dc5b9..ba437dd5 100644 --- a/eval-win7x64-enterprise-ssh.json +++ b/eval-win7x64-enterprise-ssh.json @@ -180,7 +180,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win7x64-enterprise.json b/eval-win7x64-enterprise.json index 54c02f5a..b4c01c24 100644 --- a/eval-win7x64-enterprise.json +++ b/eval-win7x64-enterprise.json @@ -172,7 +172,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win7x86-enterprise-cygwin.json b/eval-win7x86-enterprise-cygwin.json index 50edcbb4..75c66a25 100644 --- a/eval-win7x86-enterprise-cygwin.json +++ b/eval-win7x86-enterprise-cygwin.json @@ -180,7 +180,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win7x86-enterprise-ssh.json b/eval-win7x86-enterprise-ssh.json index 844ac37e..a300a564 100644 --- a/eval-win7x86-enterprise-ssh.json +++ b/eval-win7x86-enterprise-ssh.json @@ -176,7 +176,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win7x86-enterprise.json b/eval-win7x86-enterprise.json index 52713503..9b8b7e75 100644 --- a/eval-win7x86-enterprise.json +++ b/eval-win7x86-enterprise.json @@ -168,7 +168,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win81x64-enterprise-cygwin.json b/eval-win81x64-enterprise-cygwin.json index 7d12d81f..566386f8 100644 --- a/eval-win81x64-enterprise-cygwin.json +++ b/eval-win81x64-enterprise-cygwin.json @@ -181,7 +181,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win81x64-enterprise-ssh.json b/eval-win81x64-enterprise-ssh.json index e74f1056..3d74db95 100644 --- a/eval-win81x64-enterprise-ssh.json +++ b/eval-win81x64-enterprise-ssh.json @@ -181,7 +181,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win81x64-enterprise.json b/eval-win81x64-enterprise.json index bde3950d..f8024462 100644 --- a/eval-win81x64-enterprise.json +++ b/eval-win81x64-enterprise.json @@ -177,7 +177,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win81x86-enterprise-cygwin.json b/eval-win81x86-enterprise-cygwin.json index 746ba5d0..4c5050ba 100644 --- a/eval-win81x86-enterprise-cygwin.json +++ b/eval-win81x86-enterprise-cygwin.json @@ -181,7 +181,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win81x86-enterprise-ssh.json b/eval-win81x86-enterprise-ssh.json index 7e64aa6f..9946900b 100644 --- a/eval-win81x86-enterprise-ssh.json +++ b/eval-win81x86-enterprise-ssh.json @@ -177,7 +177,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/eval-win81x86-enterprise.json b/eval-win81x86-enterprise.json index 7d7e7518..cfe45bc2 100644 --- a/eval-win81x86-enterprise.json +++ b/eval-win81x86-enterprise.json @@ -173,7 +173,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2008r2-datacenter-cygwin.json b/win2008r2-datacenter-cygwin.json index 72efab3a..f97eba79 100644 --- a/win2008r2-datacenter-cygwin.json +++ b/win2008r2-datacenter-cygwin.json @@ -172,7 +172,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2008r2-datacenter-ssh.json b/win2008r2-datacenter-ssh.json index dd0febbb..27be7bc9 100644 --- a/win2008r2-datacenter-ssh.json +++ b/win2008r2-datacenter-ssh.json @@ -168,7 +168,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2008r2-datacenter.json b/win2008r2-datacenter.json index 440af37d..c1635cef 100644 --- a/win2008r2-datacenter.json +++ b/win2008r2-datacenter.json @@ -163,7 +163,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2008r2-enterprise-cygwin.json b/win2008r2-enterprise-cygwin.json index e4253fa1..91cf92e9 100644 --- a/win2008r2-enterprise-cygwin.json +++ b/win2008r2-enterprise-cygwin.json @@ -172,7 +172,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2008r2-enterprise-ssh.json b/win2008r2-enterprise-ssh.json index 5664abf6..f0a9ff75 100644 --- a/win2008r2-enterprise-ssh.json +++ b/win2008r2-enterprise-ssh.json @@ -168,7 +168,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2008r2-enterprise.json b/win2008r2-enterprise.json index 154a8f64..e3cddc01 100644 --- a/win2008r2-enterprise.json +++ b/win2008r2-enterprise.json @@ -163,7 +163,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2008r2-standard-cygwin.json b/win2008r2-standard-cygwin.json index fabe3c16..87a79ffb 100644 --- a/win2008r2-standard-cygwin.json +++ b/win2008r2-standard-cygwin.json @@ -172,7 +172,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2008r2-standard-ssh.json b/win2008r2-standard-ssh.json index 7ed41398..589da84e 100644 --- a/win2008r2-standard-ssh.json +++ b/win2008r2-standard-ssh.json @@ -168,7 +168,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2008r2-standard.json b/win2008r2-standard.json index 7879f01d..18c491da 100644 --- a/win2008r2-standard.json +++ b/win2008r2-standard.json @@ -163,7 +163,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2008r2-web-cygwin.json b/win2008r2-web-cygwin.json index b9ac2905..23471d44 100644 --- a/win2008r2-web-cygwin.json +++ b/win2008r2-web-cygwin.json @@ -172,7 +172,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2008r2-web-ssh.json b/win2008r2-web-ssh.json index ab9839a2..411e62c5 100644 --- a/win2008r2-web-ssh.json +++ b/win2008r2-web-ssh.json @@ -168,7 +168,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2008r2-web.json b/win2008r2-web.json index dff6173d..a3cf8cfb 100644 --- a/win2008r2-web.json +++ b/win2008r2-web.json @@ -163,7 +163,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2012-datacenter-cygwin.json b/win2012-datacenter-cygwin.json index 803a2325..bdac9b71 100644 --- a/win2012-datacenter-cygwin.json +++ b/win2012-datacenter-cygwin.json @@ -184,7 +184,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2012-datacenter-ssh.json b/win2012-datacenter-ssh.json index b1d91d19..591eb655 100644 --- a/win2012-datacenter-ssh.json +++ b/win2012-datacenter-ssh.json @@ -180,7 +180,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2012-datacenter.json b/win2012-datacenter.json index 2e2a8ff7..6882b729 100644 --- a/win2012-datacenter.json +++ b/win2012-datacenter.json @@ -175,7 +175,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2012-standard-cygwin.json b/win2012-standard-cygwin.json index 5c369856..39e3adb6 100644 --- a/win2012-standard-cygwin.json +++ b/win2012-standard-cygwin.json @@ -184,7 +184,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2012-standard-ssh.json b/win2012-standard-ssh.json index deb50d1d..b5b9e3fa 100644 --- a/win2012-standard-ssh.json +++ b/win2012-standard-ssh.json @@ -180,7 +180,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2012-standard.json b/win2012-standard.json index 7d268a99..592aa339 100644 --- a/win2012-standard.json +++ b/win2012-standard.json @@ -175,7 +175,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2012r2-datacenter-cygwin.json b/win2012r2-datacenter-cygwin.json index bbf90c75..458e7924 100644 --- a/win2012r2-datacenter-cygwin.json +++ b/win2012r2-datacenter-cygwin.json @@ -185,7 +185,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2012r2-datacenter-ssh.json b/win2012r2-datacenter-ssh.json index 7ed55bb3..f18e4ed1 100644 --- a/win2012r2-datacenter-ssh.json +++ b/win2012r2-datacenter-ssh.json @@ -181,7 +181,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2012r2-datacenter.json b/win2012r2-datacenter.json index bdfe6477..609f26c4 100644 --- a/win2012r2-datacenter.json +++ b/win2012r2-datacenter.json @@ -176,7 +176,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2012r2-standard-cygwin.json b/win2012r2-standard-cygwin.json index 52e16d0f..9d001cd5 100644 --- a/win2012r2-standard-cygwin.json +++ b/win2012r2-standard-cygwin.json @@ -185,7 +185,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2012r2-standard-ssh.json b/win2012r2-standard-ssh.json index c185e0d5..f3890aa0 100644 --- a/win2012r2-standard-ssh.json +++ b/win2012r2-standard-ssh.json @@ -181,7 +181,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2012r2-standard.json b/win2012r2-standard.json index b2593cdc..a498c6eb 100644 --- a/win2012r2-standard.json +++ b/win2012r2-standard.json @@ -176,7 +176,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2012r2-standardcore-cygwin.json b/win2012r2-standardcore-cygwin.json index fad47a27..87bccd79 100644 --- a/win2012r2-standardcore-cygwin.json +++ b/win2012r2-standardcore-cygwin.json @@ -185,7 +185,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2012r2-standardcore-ssh.json b/win2012r2-standardcore-ssh.json index ff09a0db..a065a06c 100644 --- a/win2012r2-standardcore-ssh.json +++ b/win2012r2-standardcore-ssh.json @@ -181,7 +181,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2012r2-standardcore.json b/win2012r2-standardcore.json index 345c2628..7614929e 100644 --- a/win2012r2-standardcore.json +++ b/win2012r2-standardcore.json @@ -176,7 +176,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2016-standard-cygwin.json b/win2016-standard-cygwin.json index 9f5a74f8..daede74d 100644 --- a/win2016-standard-cygwin.json +++ b/win2016-standard-cygwin.json @@ -189,7 +189,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2016-standard-ssh.json b/win2016-standard-ssh.json index 58eb38f1..f72b04e7 100644 --- a/win2016-standard-ssh.json +++ b/win2016-standard-ssh.json @@ -185,7 +185,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win2016-standard.json b/win2016-standard.json index 24ab6f52..69fc442e 100644 --- a/win2016-standard.json +++ b/win2016-standard.json @@ -181,7 +181,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win7x64-enterprise-cygwin.json b/win7x64-enterprise-cygwin.json index d00ed62c..c24316de 100644 --- a/win7x64-enterprise-cygwin.json +++ b/win7x64-enterprise-cygwin.json @@ -176,7 +176,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win7x64-enterprise-ssh.json b/win7x64-enterprise-ssh.json index 5625e002..213772eb 100644 --- a/win7x64-enterprise-ssh.json +++ b/win7x64-enterprise-ssh.json @@ -172,7 +172,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win7x64-enterprise.json b/win7x64-enterprise.json index 60a16fd7..716f45bd 100644 --- a/win7x64-enterprise.json +++ b/win7x64-enterprise.json @@ -163,7 +163,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win7x64-pro-cygwin.json b/win7x64-pro-cygwin.json index dad6f799..3112b286 100644 --- a/win7x64-pro-cygwin.json +++ b/win7x64-pro-cygwin.json @@ -176,7 +176,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win7x64-pro-ssh.json b/win7x64-pro-ssh.json index 02838659..c1bc54de 100644 --- a/win7x64-pro-ssh.json +++ b/win7x64-pro-ssh.json @@ -172,7 +172,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win7x64-pro.json b/win7x64-pro.json index d1cd2e44..59ac9262 100644 --- a/win7x64-pro.json +++ b/win7x64-pro.json @@ -163,7 +163,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win7x86-enterprise-cygwin.json b/win7x86-enterprise-cygwin.json index 3e2b9206..ac5e9528 100644 --- a/win7x86-enterprise-cygwin.json +++ b/win7x86-enterprise-cygwin.json @@ -176,7 +176,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win7x86-enterprise-ssh.json b/win7x86-enterprise-ssh.json index cb91de8a..cbb58f9a 100644 --- a/win7x86-enterprise-ssh.json +++ b/win7x86-enterprise-ssh.json @@ -172,7 +172,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win7x86-enterprise.json b/win7x86-enterprise.json index 4c345a65..33fade29 100644 --- a/win7x86-enterprise.json +++ b/win7x86-enterprise.json @@ -163,7 +163,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win7x86-pro-cygwin.json b/win7x86-pro-cygwin.json index 62111c87..7155088b 100644 --- a/win7x86-pro-cygwin.json +++ b/win7x86-pro-cygwin.json @@ -176,7 +176,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win7x86-pro-ssh.json b/win7x86-pro-ssh.json index 1f64451c..a9f72d02 100644 --- a/win7x86-pro-ssh.json +++ b/win7x86-pro-ssh.json @@ -172,7 +172,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win7x86-pro.json b/win7x86-pro.json index edb7083c..65b6ad4e 100644 --- a/win7x86-pro.json +++ b/win7x86-pro.json @@ -163,7 +163,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win81x64-enterprise-cygwin.json b/win81x64-enterprise-cygwin.json index 35b4909c..b3fdda1f 100644 --- a/win81x64-enterprise-cygwin.json +++ b/win81x64-enterprise-cygwin.json @@ -177,7 +177,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win81x64-enterprise-ssh.json b/win81x64-enterprise-ssh.json index 493dd2cb..45994195 100644 --- a/win81x64-enterprise-ssh.json +++ b/win81x64-enterprise-ssh.json @@ -173,7 +173,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win81x64-enterprise.json b/win81x64-enterprise.json index e267b2bc..b953802f 100644 --- a/win81x64-enterprise.json +++ b/win81x64-enterprise.json @@ -168,7 +168,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win81x64-pro-cygwin.json b/win81x64-pro-cygwin.json index 5ff44fb2..af43f09c 100644 --- a/win81x64-pro-cygwin.json +++ b/win81x64-pro-cygwin.json @@ -177,7 +177,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win81x64-pro-ssh.json b/win81x64-pro-ssh.json index 5f632840..0f92f675 100644 --- a/win81x64-pro-ssh.json +++ b/win81x64-pro-ssh.json @@ -173,7 +173,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win81x64-pro.json b/win81x64-pro.json index f712cac8..f9510e64 100644 --- a/win81x64-pro.json +++ b/win81x64-pro.json @@ -168,7 +168,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win81x86-enterprise-cygwin.json b/win81x86-enterprise-cygwin.json index 684d8b2c..1acaa3ae 100644 --- a/win81x86-enterprise-cygwin.json +++ b/win81x86-enterprise-cygwin.json @@ -169,7 +169,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win81x86-enterprise-ssh.json b/win81x86-enterprise-ssh.json index 634f9591..b4c87f99 100644 --- a/win81x86-enterprise-ssh.json +++ b/win81x86-enterprise-ssh.json @@ -165,7 +165,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win81x86-enterprise.json b/win81x86-enterprise.json index a2bb9345..fb79c096 100644 --- a/win81x86-enterprise.json +++ b/win81x86-enterprise.json @@ -160,7 +160,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win81x86-pro-cygwin.json b/win81x86-pro-cygwin.json index 7596822d..5a36035e 100644 --- a/win81x86-pro-cygwin.json +++ b/win81x86-pro-cygwin.json @@ -169,7 +169,7 @@ "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win81x86-pro-ssh.json b/win81x86-pro-ssh.json index 6237f815..4ecb808d 100644 --- a/win81x86-pro-ssh.json +++ b/win81x86-pro-ssh.json @@ -165,7 +165,7 @@ "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", diff --git a/win81x86-pro.json b/win81x86-pro.json index af1bad61..5e2a3970 100644 --- a/win81x86-pro.json +++ b/win81x86-pro.json @@ -160,7 +160,7 @@ "vm_suffix": "", "cm": "chef", "cm_version": "", - "cpus": "2",, + "cpus": "2", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", "no_proxy": "{{env `no_proxy`}}", From 127035e8777bb7a10244902a9017a729c9146d94 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Tue, 25 Feb 2020 10:11:52 -0500 Subject: [PATCH 07/13] add proxy env vars to variables --- .gitignore | 1 - README.md | 17 ++++++++++++++++- floppy/_download.cmd | 18 +++++++++++------- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6edeac1c..cfd67a28 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,3 @@ floppy/_packer_config_*.cmd *.*.json floppy/*.*.* script/*.*.* - diff --git a/README.md b/README.md index 53a284ce..614b3a75 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ + # Packer templates for Windows ### Overview @@ -142,10 +143,24 @@ You can also override these setting, such as with `floppy/_packer_config.cmd` can set configuration globally for initial install and each shell provisioner. See [floppy/_packer_config.cmd](./floppy/_packer_config.cmd) for additional details. -You can add additional `floppy/_packer_config_*.cmd` files. These files will be ignored by Git. +You can add additional `floppy/_packer_config_*.cmd` files. Thes files will be ignored by Git. `floppy/_packer_config*.cmd` will be executed in alpabetical order during initial install and at the beginning of each shell provisioner script if the script supports loading them. +#### Proxy Configuration using `floppy/_packer_config_proxy.cmd` + +Create a file called `floppy/_packer_config_proxy.cmd` with the below contents: + +``` + +set http_proxy_user=[proxy_user] +set http_proxy_password=[proxy_password] +set ftp_proxy=http://[proxy_host]:[proxy_port] +set http_proxy=http://[proxy_host]:[proxy_port] +set https_proxy=http://[proxy_host]:[proxy_port] +set no_proxy=127.0.0.1,localhost,[no_proxy_hosts] +``` + ### Acknowledgments [Parallels](http://www.parallels.com/) provides a Business Edition license of diff --git a/floppy/_download.cmd b/floppy/_download.cmd index 2ab754a0..6980e1e9 100644 --- a/floppy/_download.cmd +++ b/floppy/_download.cmd @@ -53,18 +53,22 @@ if not defined PACKER_DEBUG set WGET_OPTS=--no-verbose if not errorlevel 1 if exist "%filename%" goto exit0 :powershell -echo ==^> Downloading "%url%" to "%filename%" +echo ==^> Downloading "%url%" to "%filename%" using Powershell... if defined http_proxy ( + set "ps1_proxy=$wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ;" + if defined http_proxy_user if defined http_proxy_password ( + set "ps1_proxy_auth=$wc.proxy.Credentials = (New-Object System.Net.NetworkCredential('%http_proxy_user%', '%http_proxy_password%')) ;" + ) + if defined no_proxy ( - set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.proxy.BypassList = (('%no_proxy%').split(',')) ; $wc.DownloadFile('%url%', '%filename%')" - ) else ( - set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.DownloadFile('%url%', '%filename%')" + set "ps1_no_proxy=$wc.proxy.BypassList = (('%no_proxy%').split(',')) ;" ) -) else ( - set ps1_script="(New-Object System.Net.WebClient).DownloadFile('%url%', '%filename%')" ) +set ps1_script="$wc = (New-Object System.Net.WebClient) ; %ps1_proxy% %ps1_proxy_auth% %ps1_no_proxy% $wc.DownloadFile('%url%', '%filename%')" + +REM echo ==^> powershell -command %ps1_script% powershell -command %ps1_script% >nul if not errorlevel 1 if exist "%filename%" goto exit0 @@ -85,7 +89,7 @@ for %%i in (bitsadmin.exe) do set bitsadmin=%%~$PATH:i if not defined bitsadmin set bitsadmin=%SystemRoot%\System32\bitsadmin.exe -if not exist "%bitsadmin%" goto powershell +if not exist "%bitsadmin%" goto exit 1 for %%i in ("%filename%") do set jobname=%%~nxi From fa1181abac260a9463c77c6dcaca55b9cccf99ea Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Tue, 25 Feb 2020 10:15:10 -0500 Subject: [PATCH 08/13] add proxy env vars to variables --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 614b3a75..f39a3c10 100644 --- a/README.md +++ b/README.md @@ -152,7 +152,6 @@ You can add additional `floppy/_packer_config_*.cmd` files. Thes files will be Create a file called `floppy/_packer_config_proxy.cmd` with the below contents: ``` - set http_proxy_user=[proxy_user] set http_proxy_password=[proxy_password] set ftp_proxy=http://[proxy_host]:[proxy_port] From 7a0a8db79601316d197b2b3c9b12ee82c2e59774 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Tue, 25 Feb 2020 17:31:48 -0500 Subject: [PATCH 09/13] add authenticated proxy for wget downloads --- eval-win10x64-enterprise-cygwin.json | 6 ------ eval-win10x64-enterprise-ssh.json | 6 ------ eval-win10x64-enterprise.json | 6 ------ eval-win10x86-enterprise-cygwin.json | 6 ------ eval-win10x86-enterprise-ssh.json | 6 ------ eval-win10x86-enterprise.json | 6 ------ eval-win2008r2-datacenter-cygwin.json | 6 ------ eval-win2008r2-datacenter-ssh.json | 6 ------ eval-win2008r2-datacenter.json | 6 ------ eval-win2008r2-standard-cygwin.json | 6 ------ eval-win2008r2-standard-ssh.json | 6 ------ eval-win2008r2-standard.json | 6 ------ eval-win2012r2-datacenter-cygwin.json | 6 ------ eval-win2012r2-datacenter-ssh.json | 6 ------ eval-win2012r2-datacenter.json | 6 ------ eval-win2012r2-standard-cygwin.json | 6 ------ eval-win2012r2-standard-ssh.json | 6 ------ eval-win2012r2-standard.json | 6 ------ eval-win2016-standard-cygwin.json | 6 ------ eval-win2016-standard-ssh.json | 6 ------ eval-win2016-standard.json | 7 ------- eval-win7x64-enterprise-cygwin.json | 6 ------ eval-win7x64-enterprise-ssh.json | 6 ------ eval-win7x64-enterprise.json | 6 ------ eval-win7x86-enterprise-cygwin.json | 6 ------ eval-win7x86-enterprise-ssh.json | 6 ------ eval-win7x86-enterprise.json | 6 ------ eval-win81x64-enterprise-cygwin.json | 6 ------ eval-win81x64-enterprise-ssh.json | 6 ------ eval-win81x64-enterprise.json | 6 ------ eval-win81x86-enterprise-cygwin.json | 6 ------ eval-win81x86-enterprise-ssh.json | 6 ------ eval-win81x86-enterprise.json | 6 ------ floppy/_download.cmd | 21 ++++++++++++--------- script/cmtool.bat | 4 ++-- script/vmtool.bat | 23 +++++------------------ win2008r2-datacenter-cygwin.json | 6 ------ win2008r2-datacenter-ssh.json | 6 ------ win2008r2-datacenter.json | 6 ------ win2008r2-enterprise-cygwin.json | 6 ------ win2008r2-enterprise-ssh.json | 6 ------ win2008r2-enterprise.json | 6 ------ win2008r2-standard-cygwin.json | 6 ------ win2008r2-standard-ssh.json | 6 ------ win2008r2-standard.json | 6 ------ win2008r2-web-cygwin.json | 6 ------ win2008r2-web-ssh.json | 6 ------ win2008r2-web.json | 6 ------ win2012-datacenter-cygwin.json | 6 ------ win2012-datacenter-ssh.json | 6 ------ win2012-datacenter.json | 6 ------ win2012-standard-cygwin.json | 6 ------ win2012-standard-ssh.json | 6 ------ win2012-standard.json | 6 ------ win2012r2-datacenter-cygwin.json | 6 ------ win2012r2-datacenter-ssh.json | 6 ------ win2012r2-datacenter.json | 6 ------ win2012r2-standard-cygwin.json | 6 ------ win2012r2-standard-ssh.json | 6 ------ win2012r2-standard.json | 6 ------ win2012r2-standardcore-cygwin.json | 6 ------ win2012r2-standardcore-ssh.json | 6 ------ win2012r2-standardcore.json | 6 ------ win2016-standard-cygwin.json | 6 ------ win2016-standard-ssh.json | 6 ------ win2016-standard.json | 6 ------ win7x64-enterprise-cygwin.json | 6 ------ win7x64-enterprise-ssh.json | 6 ------ win7x64-enterprise.json | 6 ------ win7x64-pro-cygwin.json | 6 ------ win7x64-pro-ssh.json | 6 ------ win7x64-pro.json | 6 ------ win7x86-enterprise-cygwin.json | 6 ------ win7x86-enterprise-ssh.json | 6 ------ win7x86-enterprise.json | 6 ------ win7x86-pro-cygwin.json | 6 ------ win7x86-pro-ssh.json | 6 ------ win7x86-pro.json | 6 ------ win81x64-enterprise-cygwin.json | 6 ------ win81x64-enterprise-ssh.json | 6 ------ win81x64-enterprise.json | 6 ------ win81x64-pro-cygwin.json | 6 ------ win81x64-pro-ssh.json | 6 ------ win81x64-pro.json | 6 ------ win81x86-enterprise-cygwin.json | 6 ------ win81x86-enterprise-ssh.json | 6 ------ win81x86-enterprise.json | 6 ------ win81x86-pro-cygwin.json | 6 ------ win81x86-pro-ssh.json | 6 ------ win81x86-pro.json | 6 ------ 90 files changed, 19 insertions(+), 552 deletions(-) diff --git a/eval-win10x64-enterprise-cygwin.json b/eval-win10x64-enterprise-cygwin.json index 410efc8a..b77c2da3 100644 --- a/eval-win10x64-enterprise-cygwin.json +++ b/eval-win10x64-enterprise-cygwin.json @@ -171,9 +171,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -202,9 +199,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win10x64-enterprise-ssh.json b/eval-win10x64-enterprise-ssh.json index 64dd8c71..805f2f0f 100644 --- a/eval-win10x64-enterprise-ssh.json +++ b/eval-win10x64-enterprise-ssh.json @@ -167,9 +167,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -198,9 +195,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win10x64-enterprise.json b/eval-win10x64-enterprise.json index fda9841f..0c2f80e3 100644 --- a/eval-win10x64-enterprise.json +++ b/eval-win10x64-enterprise.json @@ -167,9 +167,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ @@ -190,9 +187,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win10x86-enterprise-cygwin.json b/eval-win10x86-enterprise-cygwin.json index 6c465dc6..1392230c 100644 --- a/eval-win10x86-enterprise-cygwin.json +++ b/eval-win10x86-enterprise-cygwin.json @@ -171,9 +171,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -202,9 +199,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win10x86-enterprise-ssh.json b/eval-win10x86-enterprise-ssh.json index a9f827d9..1164be6c 100644 --- a/eval-win10x86-enterprise-ssh.json +++ b/eval-win10x86-enterprise-ssh.json @@ -167,9 +167,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -198,9 +195,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win10x86-enterprise.json b/eval-win10x86-enterprise.json index 9f622383..69642454 100644 --- a/eval-win10x86-enterprise.json +++ b/eval-win10x86-enterprise.json @@ -167,9 +167,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ @@ -190,9 +187,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-datacenter-cygwin.json b/eval-win2008r2-datacenter-cygwin.json index 01d88fc5..5a5eff7a 100644 --- a/eval-win2008r2-datacenter-cygwin.json +++ b/eval-win2008r2-datacenter-cygwin.json @@ -142,9 +142,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -173,9 +170,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-datacenter-ssh.json b/eval-win2008r2-datacenter-ssh.json index 3fc8e642..6fc212f7 100644 --- a/eval-win2008r2-datacenter-ssh.json +++ b/eval-win2008r2-datacenter-ssh.json @@ -142,9 +142,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -173,9 +170,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-datacenter.json b/eval-win2008r2-datacenter.json index ba00e05a..e2a00adb 100644 --- a/eval-win2008r2-datacenter.json +++ b/eval-win2008r2-datacenter.json @@ -146,9 +146,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ @@ -169,9 +166,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-standard-cygwin.json b/eval-win2008r2-standard-cygwin.json index e6e312fc..462cd29b 100644 --- a/eval-win2008r2-standard-cygwin.json +++ b/eval-win2008r2-standard-cygwin.json @@ -142,9 +142,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -173,9 +170,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-standard-ssh.json b/eval-win2008r2-standard-ssh.json index b3f373ea..4c12bd6b 100644 --- a/eval-win2008r2-standard-ssh.json +++ b/eval-win2008r2-standard-ssh.json @@ -138,9 +138,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -169,9 +166,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2008r2-standard.json b/eval-win2008r2-standard.json index 930ca4fa..9ccefc1b 100644 --- a/eval-win2008r2-standard.json +++ b/eval-win2008r2-standard.json @@ -142,9 +142,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ @@ -165,9 +162,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-datacenter-cygwin.json b/eval-win2012r2-datacenter-cygwin.json index bbb1997f..4423610b 100644 --- a/eval-win2012r2-datacenter-cygwin.json +++ b/eval-win2012r2-datacenter-cygwin.json @@ -159,9 +159,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -190,9 +187,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-datacenter-ssh.json b/eval-win2012r2-datacenter-ssh.json index 703cf79c..cf223c38 100644 --- a/eval-win2012r2-datacenter-ssh.json +++ b/eval-win2012r2-datacenter-ssh.json @@ -155,9 +155,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -186,9 +183,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-datacenter.json b/eval-win2012r2-datacenter.json index 51dd8930..c9555de5 100644 --- a/eval-win2012r2-datacenter.json +++ b/eval-win2012r2-datacenter.json @@ -159,9 +159,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ @@ -182,9 +179,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-standard-cygwin.json b/eval-win2012r2-standard-cygwin.json index 5815caaa..8fea4224 100644 --- a/eval-win2012r2-standard-cygwin.json +++ b/eval-win2012r2-standard-cygwin.json @@ -159,9 +159,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -190,9 +187,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-standard-ssh.json b/eval-win2012r2-standard-ssh.json index 4281ff52..46e2be0a 100644 --- a/eval-win2012r2-standard-ssh.json +++ b/eval-win2012r2-standard-ssh.json @@ -155,9 +155,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -186,9 +183,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2012r2-standard.json b/eval-win2012r2-standard.json index e477da0b..d30c4b06 100644 --- a/eval-win2012r2-standard.json +++ b/eval-win2012r2-standard.json @@ -159,9 +159,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ @@ -182,9 +179,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2016-standard-cygwin.json b/eval-win2016-standard-cygwin.json index 4906fc3b..41a4a7cb 100644 --- a/eval-win2016-standard-cygwin.json +++ b/eval-win2016-standard-cygwin.json @@ -159,9 +159,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -190,9 +187,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2016-standard-ssh.json b/eval-win2016-standard-ssh.json index c6cde591..9bd167ba 100644 --- a/eval-win2016-standard-ssh.json +++ b/eval-win2016-standard-ssh.json @@ -155,9 +155,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -186,9 +183,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win2016-standard.json b/eval-win2016-standard.json index 5a7bd3c1..bdad20b2 100644 --- a/eval-win2016-standard.json +++ b/eval-win2016-standard.json @@ -159,9 +159,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ @@ -169,7 +166,6 @@ "{{template_dir}}/script/cmtool.bat", "{{template_dir}}/script/vmtool.bat", "{{template_dir}}/script/clean.bat", - "{{template_dir}}/script/ultradefrag.bat", "{{template_dir}}/script/uninstall-7zip.bat", "{{template_dir}}/script/sdelete.bat" ], @@ -182,9 +178,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x64-enterprise-cygwin.json b/eval-win7x64-enterprise-cygwin.json index f68dc090..aa3f1036 100644 --- a/eval-win7x64-enterprise-cygwin.json +++ b/eval-win7x64-enterprise-cygwin.json @@ -150,9 +150,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -181,9 +178,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "3072", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x64-enterprise-ssh.json b/eval-win7x64-enterprise-ssh.json index ba437dd5..a57d6d34 100644 --- a/eval-win7x64-enterprise-ssh.json +++ b/eval-win7x64-enterprise-ssh.json @@ -150,9 +150,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -181,9 +178,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "3072", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x64-enterprise.json b/eval-win7x64-enterprise.json index b4c01c24..a4eda71d 100644 --- a/eval-win7x64-enterprise.json +++ b/eval-win7x64-enterprise.json @@ -150,9 +150,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ @@ -173,9 +170,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "3072", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x86-enterprise-cygwin.json b/eval-win7x86-enterprise-cygwin.json index 75c66a25..47ba7622 100644 --- a/eval-win7x86-enterprise-cygwin.json +++ b/eval-win7x86-enterprise-cygwin.json @@ -150,9 +150,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -181,9 +178,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x86-enterprise-ssh.json b/eval-win7x86-enterprise-ssh.json index a300a564..5ab14885 100644 --- a/eval-win7x86-enterprise-ssh.json +++ b/eval-win7x86-enterprise-ssh.json @@ -146,9 +146,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -177,9 +174,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win7x86-enterprise.json b/eval-win7x86-enterprise.json index 9b8b7e75..e658dd5d 100644 --- a/eval-win7x86-enterprise.json +++ b/eval-win7x86-enterprise.json @@ -146,9 +146,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ @@ -169,9 +166,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x64-enterprise-cygwin.json b/eval-win81x64-enterprise-cygwin.json index 566386f8..2dc1ca79 100644 --- a/eval-win81x64-enterprise-cygwin.json +++ b/eval-win81x64-enterprise-cygwin.json @@ -151,9 +151,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -182,9 +179,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x64-enterprise-ssh.json b/eval-win81x64-enterprise-ssh.json index 3d74db95..f1a0b405 100644 --- a/eval-win81x64-enterprise-ssh.json +++ b/eval-win81x64-enterprise-ssh.json @@ -151,9 +151,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -182,9 +179,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x64-enterprise.json b/eval-win81x64-enterprise.json index f8024462..d1300184 100644 --- a/eval-win81x64-enterprise.json +++ b/eval-win81x64-enterprise.json @@ -155,9 +155,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ @@ -178,9 +175,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x86-enterprise-cygwin.json b/eval-win81x86-enterprise-cygwin.json index 4c5050ba..f4dab180 100644 --- a/eval-win81x86-enterprise-cygwin.json +++ b/eval-win81x86-enterprise-cygwin.json @@ -151,9 +151,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -182,9 +179,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x86-enterprise-ssh.json b/eval-win81x86-enterprise-ssh.json index 9946900b..dac83d44 100644 --- a/eval-win81x86-enterprise-ssh.json +++ b/eval-win81x86-enterprise-ssh.json @@ -147,9 +147,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", @@ -178,9 +175,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/eval-win81x86-enterprise.json b/eval-win81x86-enterprise.json index cfe45bc2..0532632a 100644 --- a/eval-win81x86-enterprise.json +++ b/eval-win81x86-enterprise.json @@ -151,9 +151,6 @@ "CM={{user `cm`}}", "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}", "UPDATE={{user `update`}}" ], "scripts": [ @@ -174,9 +171,6 @@ "cm": "chef", "cm_version": "", "cpus": "2", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "no_proxy": "{{env `no_proxy`}}", "memory": "2048", "disk_size": "40960", "hw_version": "7", diff --git a/floppy/_download.cmd b/floppy/_download.cmd index 6980e1e9..97c4cbce 100644 --- a/floppy/_download.cmd +++ b/floppy/_download.cmd @@ -4,9 +4,9 @@ if not defined PACKER_SEARCH_PATHS set PACKER_SEARCH_PATHS="%USERPROFILE%" a: b: c: d: e: f: g: h: i: j: k: l: m: n: o: p: q: r: s: t: u: v: w: x: y: z: -set url=%~1 +set "url=%~1" -set filename=%~2 +set "filename=%~2" if not defined url echo ==^> ERROR: _download.cmd called without URL parameter. & goto exit1 @@ -32,8 +32,6 @@ copy /y "%found%" "%filename%" && goto exit0 :download -echo ==^> Downloading "%url%" to "%filename%" - set wget= for %%i in (wget.exe) do set wget=%%~$PATH:i @@ -46,8 +44,16 @@ if defined wget goto wget if not exist "%wget%" goto powershell +echo ==^> Downloading "%url%" to "%filename%" with "wget.exe"... + if not defined PACKER_DEBUG set WGET_OPTS=--no-verbose +if defined http_proxy ( + if defined http_proxy_user if defined http_proxy_password ( + set WGET_OPTS=%WGET_OPTS% --proxy-user='%http_proxy_user%' --proxy-passwd='%http_proxy_password%' + ) +) + "%wget%" --no-check-certificate %WGET_OPTS% -O "%filename%" "%url%" if not errorlevel 1 if exist "%filename%" goto exit0 @@ -68,15 +74,10 @@ if defined http_proxy ( set ps1_script="$wc = (New-Object System.Net.WebClient) ; %ps1_proxy% %ps1_proxy_auth% %ps1_no_proxy% $wc.DownloadFile('%url%', '%filename%')" -REM echo ==^> powershell -command %ps1_script% powershell -command %ps1_script% >nul if not errorlevel 1 if exist "%filename%" goto exit0 -if defined DISABLE_BITS ( - if "%DISABLE_BITS%" == "1" if not exist "%filename%" goto exit1 -) - :bitsadmin if defined DISABLE_BITS ( @@ -91,6 +92,8 @@ if not defined bitsadmin set bitsadmin=%SystemRoot%\System32\bitsadmin.exe if not exist "%bitsadmin%" goto exit 1 +echo ==^> Downloading "%url%" to "%filename%" with "BITS"... + for %%i in ("%filename%") do set jobname=%%~nxi "%bitsadmin%" /transfer "%jobname%" "%url%" "%filename%" diff --git a/script/cmtool.bat b/script/cmtool.bat index 6b50932a..5c7a6c3c 100644 --- a/script/cmtool.bat +++ b/script/cmtool.bat @@ -102,7 +102,7 @@ set url="https://omnitruck.chef.io/%OMNITRUCK_CHANNEL%/%OMNITRUCK_PRODUCT%/metad set filename="%TEMP%\omnitruck.txt" echo ==^> Using Chef Omnitruck API URL: !url! -powershell -command "(New-Object System.Net.WebClient).DownloadFile('!url!', '!filename!')" +call "%SystemRoot%\_download.cmd" !url! !filename! if not exist "%TEMP%\omnitruck.txt" ( echo Unable to download metadata for %OMNITRUCK_PRODUCT% %OMNITRUCK_VERSION% on the %OMNITRUCK_CHANNEL% channel for %OMNITRUCK_PLATFORM% %OMNITRUCK_MACHINE_ARCH% @@ -296,7 +296,7 @@ if "%CM_VERSION%" == "latest" ( set SALT_PATH=%SALT_DIR%\Salt-Minion-Setup.exe echo ==^> Downloading %SALT_URL% to %SALT_PATH% -powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SALT_URL%', '%SALT_PATH%')" Installing Salt minion %CM_VERSION%-%SALT_PYTHONVERSION% with %SALT_PATH% diff --git a/script/vmtool.bat b/script/vmtool.bat index 6d394095..d9aaa33c 100644 --- a/script/vmtool.bat +++ b/script/vmtool.bat @@ -38,12 +38,7 @@ set SEVENZIP_PATH=%SEVENZIP_DIR%\%SEVENZIP_MSI% echo ==^> Creating "%SEVENZIP_DIR%" mkdir "%SEVENZIP_DIR%" cd /d "%SEVENZIP_DIR%" -if exist "%SystemRoot%\_download.cmd" ( - call "%SystemRoot%\_download.cmd" "%SEVENZIP_URL%" "%SEVENZIP_PATH%" -) else ( - echo ==^> Downloading "%SEVENZIP_URL%" to "%SEVENZIP_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SEVENZIP_URL%', '%SEVENZIP_PATH%')" Installing "%SEVENZIP_PATH%" msiexec /qb /i "%SEVENZIP_PATH%" @@ -126,12 +121,8 @@ if defined VMWARE_TOOLS_ISO_PATH for %%i in (%VMWARE_TOOLS_ISO_PATH%) do set _VM if %_VMWARE_TOOLS_SIZE% EQU 0 set VMWARE_TOOLS_ISO_PATH= if defined VMWARE_TOOLS_ISO_PATH goto install_vmware_tools_from_iso -if exist "%SystemRoot%\_download.cmd" ( - call "%SystemRoot%\_download.cmd" "%VMWARE_TOOLS_TAR_URL%" "%VMWARE_TOOLS_TAR_PATH%" -) else ( - echo ==^> Downloading "%VMWARE_TOOLS_TAR_URL%" to "%VMWARE_TOOLS_TAR_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%VMWARE_TOOLS_TAR_URL%', '%VMWARE_TOOLS_TAR_PATH%')" Downloading "%VBOX_ISO_URL%" to "%VBOX_ISO_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%VBOX_ISO_URL%', '%VBOX_ISO_PATH%')" Date: Tue, 25 Feb 2020 17:37:46 -0500 Subject: [PATCH 10/13] add authenticated proxy for wget downloads --- floppy/_download.cmd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/floppy/_download.cmd b/floppy/_download.cmd index 97c4cbce..961e0620 100644 --- a/floppy/_download.cmd +++ b/floppy/_download.cmd @@ -31,6 +31,8 @@ echo ==^> Copying "%found%" to "%filename%", skipping download. copy /y "%found%" "%filename%" && goto exit0 :download +REM IT IS JUST CLEANER WITH THIS WGET IS REALLY PICKY. POWERSHELL - NOT SO MUCH +if defined http_proxy goto powershell set wget= From c0565afa2e566c0d818f57b5c69fa965c7877a16 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Tue, 25 Feb 2020 17:45:06 -0500 Subject: [PATCH 11/13] add authenticated proxy for wget downloads --- eval-win2016-standard.json | 1 + 1 file changed, 1 insertion(+) diff --git a/eval-win2016-standard.json b/eval-win2016-standard.json index bdad20b2..ce98548d 100644 --- a/eval-win2016-standard.json +++ b/eval-win2016-standard.json @@ -166,6 +166,7 @@ "{{template_dir}}/script/cmtool.bat", "{{template_dir}}/script/vmtool.bat", "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", "{{template_dir}}/script/uninstall-7zip.bat", "{{template_dir}}/script/sdelete.bat" ], From d1ce7761978270f6f8a177ceb3a4c77d5b9eb3b5 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Wed, 26 Feb 2020 10:58:05 -0500 Subject: [PATCH 12/13] sync --- floppy/_download.cmd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/floppy/_download.cmd b/floppy/_download.cmd index 961e0620..066e5d5a 100644 --- a/floppy/_download.cmd +++ b/floppy/_download.cmd @@ -46,7 +46,7 @@ if defined wget goto wget if not exist "%wget%" goto powershell -echo ==^> Downloading "%url%" to "%filename%" with "wget.exe"... +echo ==^> Downloading "%url%" to "%filename%" using "%wget%"... if not defined PACKER_DEBUG set WGET_OPTS=--no-verbose @@ -61,7 +61,7 @@ if defined http_proxy ( if not errorlevel 1 if exist "%filename%" goto exit0 :powershell -echo ==^> Downloading "%url%" to "%filename%" using Powershell... +echo ==^> Downloading "%url%" to "%filename%" using "Powershell"... if defined http_proxy ( set "ps1_proxy=$wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ;" @@ -94,7 +94,7 @@ if not defined bitsadmin set bitsadmin=%SystemRoot%\System32\bitsadmin.exe if not exist "%bitsadmin%" goto exit 1 -echo ==^> Downloading "%url%" to "%filename%" with "BITS"... +echo ==^> Downloading "%url%" to "%filename%" using "BITS"... for %%i in ("%filename%") do set jobname=%%~nxi From 430386a0e9e3fcabef2f50aeff7da4c678f46ff9 Mon Sep 17 00:00:00 2001 From: Dax T Games Date: Sun, 15 Mar 2020 10:48:43 -0400 Subject: [PATCH 13/13] fix spelling --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f39a3c10..bf9f8320 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ You can also override these setting, such as with `floppy/_packer_config.cmd` can set configuration globally for initial install and each shell provisioner. See [floppy/_packer_config.cmd](./floppy/_packer_config.cmd) for additional details. -You can add additional `floppy/_packer_config_*.cmd` files. Thes files will be ignored by Git. +You can add additional `floppy/_packer_config_*.cmd` files. These files will be ignored by Git. `floppy/_packer_config*.cmd` will be executed in alpabetical order during initial install and at the beginning of each shell provisioner script if the script supports loading them.