diff --git a/CHANGELOG.md b/CHANGELOG.md index 22fa57c..d911569 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# v2023.08.03 + +## What's Changed + +- Set RootDir depending on Salt Version by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/1952 +- Bump to `certifi==2023.07.22` due to https://github.com/advisories/GHSA-xqr8-7jwr-rhp7 by @s0undt3ch in https://github.com/saltstack/salt-bootstrap/pull/1954 +- Update windows commands to support TLS1.2 by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/1956 + +**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2023.07.25...v2023.08.03 + # v2023.07.25 ## What's Changed diff --git a/README.rst b/README.rst index 7d906ef..210d38b 100644 --- a/README.rst +++ b/README.rst @@ -32,6 +32,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file. The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is: +- 2023.07.25: ``eaaaadaed40fe2e791d59a9e48f24449428a35ca61782d9139f1272c05524323`` - 2023.06.28: ``f45f5da8abee27ef385131f5cfa9382d3a15863d0a05688a0404d2f057b27776`` - 2023.04.26: ``516fa9cc2e258cb8484ff360b9674b46918f657985c21ca9301e42a3dd263d60`` - 2023.04.21: ``e364428aa7a25f8e2c5e18e36e222351724c6cf35a1d57158f3357cde1e0a0f0`` @@ -399,18 +400,18 @@ Install on Windows Using ``PowerShell`` to install latest stable version: -.. code:: console +.. code:: powershell - Invoke-WebRequest -Uri https://winbootstrap.saltproject.io -OutFile $env:TEMP\bootstrap-salt.ps1 - Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope CurrentUser - & $env:TEMP\bootstrap-salt.ps1 - Set-ExecutionPolicy -ExecutionPolicy Undefined -Scope CurrentUser + [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Tls12' + Invoke-WebRequest -Uri https://winbootstrap.saltproject.io -OutFile "$env:TEMP\bootstrap-salt.ps1" + Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser + & "$env:TEMP\bootstrap-salt.ps1" Display information about the install script parameters: -.. code:: console +.. code:: powershell - help $env:TEMP\bootstrap-salt.ps1 -Detailed + Get-Help $env:TEMP\bootstrap-salt.ps1 -Detailed Using ``cygwin`` to install latest stable version: diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1 index 74c7b20..b7d528e 100644 --- a/bootstrap-salt.ps1 +++ b/bootstrap-salt.ps1 @@ -353,7 +353,14 @@ if ($RunService.ToLower() -eq "true") { $ConfiguredAnything = $False -$RootDir = "C:\salt" +# Detect older version of Salt to determing default RootDir +if ($majorVersion -lt 3004) { + $RootDir = "$env:SystemDrive`:\salt" +} else { + $RootDir = "$env:ProgramData\Salt Project\Salt" +} + +# Check for existing installation where RootDir is stored in the registry $SaltRegKey = "HKLM:\SOFTWARE\Salt Project\Salt" if (Test-Path -Path $SaltRegKey) { if ($null -ne (Get-ItemProperty $SaltRegKey).root_dir) { diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index b937fbb..ace3bce 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -23,7 +23,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2023.07.25" +__ScriptVersion="2023.08.03" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0" diff --git a/requirements/release.txt b/requirements/release.txt index b4d5a12..992ea03 100644 --- a/requirements/release.txt +++ b/requirements/release.txt @@ -12,7 +12,7 @@ botocore==1.29.110 # via # boto3 # s3transfer -certifi==2022.12.7 +certifi==2023.07.22 # via requests cfgv==3.3.1 # via pre-commit