4
4
5
5
{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
6
6
7
+ {%- set repoarch = 'amd64' if salt['grains.get']('osarch', '') == 'x86_64' else 'arm64' %}
7
8
{%- set osrelease = salt['grains.get']('osrelease', '') %}
8
9
{%- set salt_release = salt['pillar.get']('salt:release', 'latest') %}
9
10
{%- if salt_release.split('.')|length >= 3 %}
@@ -22,13 +23,13 @@ Amazon:
22
23
pkgrepo_name : saltstack-amzn-repo
23
24
pkgrepo_humanname : SaltStack repo for Amazon Linux 2
24
25
pkgrepo : ' {{ salt_repo }}/{{ py_ver_repr or ' yum' }}/amazon/2/$basearch/{{ salt_release }}'
25
- key_url : ' {{ salt_repo }}/{{ py_ver_repr or ' yum' }}/amazon/2/$basearch/{{ salt_release }}/SALTSTACK- GPG-KEY .pub'
26
+ key_url : ' {{ salt_repo }}/{{ py_ver_repr or ' yum' }}/amazon/2/$basearch/{{ salt_release }}/SALT-PROJECT- GPG-PUBKEY-{{ "today" | strftime("%Y") }} .pub'
26
27
27
28
Ubuntu :
28
- pkgrepo : ' deb [signed-by=/usr/share/keyrings/salt-archive-keyring .gpg arch=amd64 ] {{ salt_repo }}/{{ py_ver_repr or ' apt' }}/{{ os_lower }}/{{ osrelease }}/amd64 /{{ salt_release }} {{ oscodename }} main'
29
- pkgrepo_keyring : ' {{ salt_repo }}/{{ py_ver_repr or ' apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/salt-archive-keyring .gpg'
29
+ pkgrepo : ' deb [signed-by=/usr/share/keyrings/SALT-PROJECT-GPG-PUBKEY-{{ "today" | strftime("%Y") }} .gpg arch={{ repoarch }} ] {{ salt_repo }}/{{ py_ver_repr or ' apt' }}/{{ os_lower }}/{{ osrelease }}/{{ repoarch }} /{{ salt_release }} {{ oscodename }} main'
30
+ pkgrepo_keyring : ' {{ salt_repo }}/{% if oscodename == "jammy" %}salt/{% endif %}{{ py_ver_repr or ' apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-{{ "today" | strftime("%Y") }} .gpg'
30
31
pkgrepo_keyring_hash : sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
31
- key_url : ' {{ salt_repo }}/{{ py_ver_repr or ' apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALTSTACK- GPG-KEY.pub '
32
+ key_url : ' {{ salt_repo }}/{{ py_ver_repr or ' apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALT-PROJECT- GPG-PUBKEY-{{ "today" | strftime("%Y") }}.gpg '
32
33
pygit2 : python-pygit2
33
34
gitfs :
34
35
pygit2 :
@@ -39,7 +40,7 @@ Ubuntu:
39
40
40
41
Raspbian :
41
42
pkgrepo : ' deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=armhf] {{ salt_repo }}/{{ py_ver_repr or ' py3' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }} {{ oscodename }} main'
42
- pkgrepo_keyring : ' {{ salt_repo }}/{{ py_ver_repr or ' py3' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }}/salt-archive-keyring .gpg'
43
+ pkgrepo_keyring : ' {{ salt_repo }}/{{ py_ver_repr or ' py3' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-{{ "today" | strftime("%Y") }} .gpg'
43
44
44
45
SmartOS :
45
46
salt_master : salt
0 commit comments