Skip to content

Commit 61c2a7b

Browse files
authored
fix: ensure repo key exists with right perms (#533)
1 parent 33d1ba2 commit 61c2a7b

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

salt/base/salt.sls

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,21 @@ salt-pin-config:
4444
- user: root
4545
- group: root
4646
- mode: "0644"
47-
{% endif %}
47+
48+
salt-repo-key:
49+
file.managed:
50+
- name: /etc/apt/keyrings/salt-archive-keyring-2024.pgp
51+
- source: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
52+
- mode: '0644'
53+
- skip_verify: True
4854

4955
salt-repo:
5056
pkgrepo.managed:
51-
{% if grains["oscodename"] in ["focal", "jammy", "noble"] %}
5257
- name: deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2024.pgp arch={{ grains["osarch"] }}] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main
53-
- key_url: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
5458
- aptkey: False
5559
- file: /etc/apt/sources.list.d/salt.list
56-
{% endif %}
60+
- require:
61+
- file: salt-repo-key
5762
{% endif %}
5863

5964

0 commit comments

Comments
 (0)