From 41db04a13d20ccdd18f9da40192663719143b783 Mon Sep 17 00:00:00 2001
From: Jacob Coffee <jacob@z7x.org>
Date: Wed, 6 Nov 2024 13:03:57 -0600
Subject: [PATCH] fix: support ipv6 and ipv4

https://docs.haproxy.org/3.0/configuration.html#7.3.3-bc_src
---
 salt/base/salt.sls | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/salt/base/salt.sls b/salt/base/salt.sls
index 046ad82e..bb5ebce9 100644
--- a/salt/base/salt.sls
+++ b/salt/base/salt.sls
@@ -36,20 +36,14 @@ remove_old_salt_repo:
 salt-repo:
   pkgrepo.managed:
     - humanname: repo.saltstack.org
-    {% if grains["oscodename"] == "focal" %}
-    - name: deb https://archive.repo.saltproject.io/py3/ubuntu/20.04/{{ grains["osarch"] }}/archive/3004 focal main
-    - key_url: https://archive.repo.saltproject.io/py3/ubuntu/20.04/{{ grains["osarch"] }}/archive/3004/salt-archive-keyring.gpg
-    {% elif grains["oscodename"] == "jammy" %}
+    {% if grains["oscodename"] == "jammy" %}
     - name: deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.gpg arch={{ grains["osarch"] }}] https://repo.saltproject.io/salt/py3/ubuntu/22.04/{{ grains["osarch"] }}/3007 jammy main
-    - key_url: https://repo.saltproject.io/salt/py3/ubuntu/22.04/{{ grains["osarch"] }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg
+    - key_url: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
     - aptkey: False
     {% elif grains["oscodename"] == "noble" %}
     - name: deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.gpg arch={{ grains["osarch"] }}] https://repo.saltproject.io/salt/py3/ubuntu/24.04/{{ grains["osarch"] }}/3007 noble main
-    - key_url: https://repo.saltproject.io/salt/py3/ubuntu/24.04/{{ grains["osarch"] }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg
+    - key_url: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
     - aptkey: False
-    {% else %}
-    - name: deb http://archive.repo.saltstack.com/py3/ubuntu/{{ grains["osrelease"] }}/{{ grains["osarch"] }}/2018.3 {{ grains["oscodename"] }} main
-    - key_url: https://archive.repo.saltstack.com/py3/ubuntu/18.04/amd64/2018.3/SALTSTACK-GPG-KEY.pub
     {% endif %}
     - file: /etc/apt/sources.list.d/salt.list
 {% endif %}