Skip to content

Commit

Permalink
Revert "Updated script/cmtool.bat to patch the downloaded installer f…
Browse files Browse the repository at this point in the history
…or salt-bootstrap in order to fix issue saltstack/salt-bootstrap#1406."

This reverts commit 9645c59.
  • Loading branch information
arizvisa committed Jul 18, 2020
1 parent 68b0879 commit 30461a9
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions script/cmtool.bat
Original file line number Diff line number Diff line change
Expand Up @@ -258,20 +258,13 @@ if "%PlatformVersionMajor%" == "6" if "%PlatformVersionMinor%" == "1" goto saltr
:saltbootstrap
::::::::::::

:: We hardcode the CM_VERSION here to workaround saltstack/salt-bootstrap#1394
if "%CM_VERSION%" == "latest" set CM_VERSION=2019.2.2

set SALT_URL=http://raw.githubusercontent.com/saltstack/salt-bootstrap/%SALT_REVISION%/bootstrap-salt.ps1

set SALT_PATH=%SALT_DIR%\bootstrap-salt.ps1
set SALT_DOWNLOAD=%SALT_DIR%\bootstrap-salt.download.ps1

echo ==^> Downloading %SALT_URL% to %SALT_DOWNLOAD%
powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SALT_URL%', '%SALT_DOWNLOAD%')" <NUL
echo ==^> Downloading %SALT_URL% to %SALT_PATH%
powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SALT_URL%', '%SALT_PATH%')" <NUL

if not exist "%SALT_DOWNLOAD%" goto exit1
echo ==^> Patching bootstrap-salt.ps1 at %SALT_DOWNLOAD%
powershell -command "(get-content \"%SALT_DOWNLOAD%\") -replace \"'Tls,Tls11,Tls12'\", \"0xc0,0x300,0xc00\" | set-content \"%SALT_PATH%\""
if not exist "%SALT_PATH%" goto exit1

echo ==^> Installing Salt minion with %SALT_PATH%
if "%CM_VERSION%" == "latest" (
Expand Down

0 comments on commit 30461a9

Please sign in to comment.