Skip to content

Commit 41db04a

Browse files
committed
1 parent dd17288 commit 41db04a

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

salt/base/salt.sls

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,14 @@ remove_old_salt_repo:
3636
salt-repo:
3737
pkgrepo.managed:
3838
- humanname: repo.saltstack.org
39-
{% if grains["oscodename"] == "focal" %}
40-
- name: deb https://archive.repo.saltproject.io/py3/ubuntu/20.04/{{ grains["osarch"] }}/archive/3004 focal main
41-
- key_url: https://archive.repo.saltproject.io/py3/ubuntu/20.04/{{ grains["osarch"] }}/archive/3004/salt-archive-keyring.gpg
42-
{% elif grains["oscodename"] == "jammy" %}
39+
{% if grains["oscodename"] == "jammy" %}
4340
- 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
44-
- key_url: https://repo.saltproject.io/salt/py3/ubuntu/22.04/{{ grains["osarch"] }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg
41+
- key_url: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
4542
- aptkey: False
4643
{% elif grains["oscodename"] == "noble" %}
4744
- 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
48-
- key_url: https://repo.saltproject.io/salt/py3/ubuntu/24.04/{{ grains["osarch"] }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg
45+
- key_url: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
4946
- aptkey: False
50-
{% else %}
51-
- name: deb http://archive.repo.saltstack.com/py3/ubuntu/{{ grains["osrelease"] }}/{{ grains["osarch"] }}/2018.3 {{ grains["oscodename"] }} main
52-
- key_url: https://archive.repo.saltstack.com/py3/ubuntu/18.04/amd64/2018.3/SALTSTACK-GPG-KEY.pub
5347
{% endif %}
5448
- file: /etc/apt/sources.list.d/salt.list
5549
{% endif %}

0 commit comments

Comments
 (0)