From c9ca8e7c88d77707dace45015b650566e5cfb859 Mon Sep 17 00:00:00 2001 From: Max Arnold Date: Sat, 26 Oct 2024 10:21:55 +0700 Subject: [PATCH 1/2] Fix Salt bootstrap script URLs See https://saltproject.io/blog/salt-bootstrap-breakage/ for more details --- plugins/provisioners/salt/bootstrap_downloader.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/provisioners/salt/bootstrap_downloader.rb b/plugins/provisioners/salt/bootstrap_downloader.rb index bd4b25181..8ebf4122f 100644 --- a/plugins/provisioners/salt/bootstrap_downloader.rb +++ b/plugins/provisioners/salt/bootstrap_downloader.rb @@ -8,9 +8,9 @@ require_relative "./errors" module VagrantPlugins module Salt class BootstrapDownloader - WINDOWS_URL = "https://winbootstrap.saltproject.io" - URL = "https://bootstrap.saltproject.io" - SHA256_SUFFIX = "sha256" + WINDOWS_URL = "https://winbootstrap.saltproject.io/bootstrap-salt.ps1" + URL = "https://bootstrap.saltproject.io/bootstrap-salt.sh" + SHA256_SUFFIX = ".sha256" def initialize(guest) @guest = guest @@ -32,8 +32,8 @@ module VagrantPlugins end def verify_sha256(script) - @logger.debug "Downloading sha256 file from #{source_url}/#{SHA256_SUFFIX}" - sha256_file = download("#{source_url}/#{SHA256_SUFFIX}") + @logger.debug "Downloading sha256 file from #{source_url}#{SHA256_SUFFIX}" + sha256_file = download("#{source_url}#{SHA256_SUFFIX}") sha256 = extract_sha256(sha256_file.read) sha256_file.close From fd281cffcdb2216be813df079d96d642f1342cc6 Mon Sep 17 00:00:00 2001 From: Max Arnold Date: Wed, 30 Oct 2024 07:09:51 +0700 Subject: [PATCH 2/2] Switch to salt-bootstrap Github releases URLs See https://saltproject.io/blog/salt-bootstrap-breakage-part-2/ for the explanation --- plugins/provisioners/salt/bootstrap_downloader.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/provisioners/salt/bootstrap_downloader.rb b/plugins/provisioners/salt/bootstrap_downloader.rb index 8ebf4122f..8c0abd036 100644 --- a/plugins/provisioners/salt/bootstrap_downloader.rb +++ b/plugins/provisioners/salt/bootstrap_downloader.rb @@ -8,8 +8,8 @@ require_relative "./errors" module VagrantPlugins module Salt class BootstrapDownloader - WINDOWS_URL = "https://winbootstrap.saltproject.io/bootstrap-salt.ps1" - URL = "https://bootstrap.saltproject.io/bootstrap-salt.sh" + WINDOWS_URL = "https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.ps1" + URL = "https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh" SHA256_SUFFIX = ".sha256" def initialize(guest)