From e5a814c9df02ea81ca3785f96c3af1fb2cd02292 Mon Sep 17 00:00:00 2001
From: Dennis Dudek <100142218+Dudek-AMS@users.noreply.github.com>
Date: Mon, 8 Jan 2024 12:05:24 +0100
Subject: [PATCH 1/2] Fix DEBIAN Keyring url

URL was invalid (old) and breaks
---
 bootstrap-salt.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index c632146e4..c7e332424 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -3660,10 +3660,10 @@ __install_saltstack_debian_repository() {
     __apt_get_install_noinput ${__PACKAGES} || return 1
 
     # amd64 is just a part of repository URI, 32-bit pkgs are hosted under the same location
-    SALTSTACK_DEBIAN_URL="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/debian/${DEBIAN_RELEASE}/${__REPO_ARCH}/${STABLE_REV}"
+    SALTSTACK_DEBIAN_URL="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/debian/${DEBIAN_RELEASE}/${__REPO_ARCH}"
     echo "$__REPO_ARCH_DEB $SALTSTACK_DEBIAN_URL $DEBIAN_CODENAME main" > "/etc/apt/sources.list.d/salt.list"
 
-    __apt_key_fetch "$SALTSTACK_DEBIAN_URL/salt-archive-keyring.gpg" || return 1
+    __apt_key_fetch "$SALTSTACK_DEBIAN_URL/SALT-PROJECT-GPG-PUBKEY-2023.gpg || return 1
 
     __wait_for_apt apt-get update || return 1
 }

From cecea60a06312057d55d6348d80552b3108a2ea5 Mon Sep 17 00:00:00 2001
From: Dennis Dudek <100142218+Dudek-AMS@users.noreply.github.com>
Date: Tue, 9 Jan 2024 19:47:53 +0100
Subject: [PATCH 2/2] Update bootstrap-salt.sh

fixed missing quotes
---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index c7e332424..5cfed2a12 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -3663,7 +3663,7 @@ __install_saltstack_debian_repository() {
     SALTSTACK_DEBIAN_URL="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/debian/${DEBIAN_RELEASE}/${__REPO_ARCH}"
     echo "$__REPO_ARCH_DEB $SALTSTACK_DEBIAN_URL $DEBIAN_CODENAME main" > "/etc/apt/sources.list.d/salt.list"
 
-    __apt_key_fetch "$SALTSTACK_DEBIAN_URL/SALT-PROJECT-GPG-PUBKEY-2023.gpg || return 1
+    __apt_key_fetch "$SALTSTACK_DEBIAN_URL/SALT-PROJECT-GPG-PUBKEY-2023.gpg" || return 1
 
     __wait_for_apt apt-get update || return 1
 }