saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

fix: update to modern defaults for Debian family

Browse Source 
Don't add key_url as it is deprecated and not needed when
pkgrepo_keyring is set. This has been supported since stretch so make it
the default. Also use py3 repo by default for Debian family as it is now
the only option.

Additionally, Raspbian has been updated to use signed-by by default.
This commit is contained in:
hk 2021-11-04 15:52:41 +01:00
parent 97e1d1f07a
commit a932a8cc84
7 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pillar.example
View File

@ -14,7 +14,7 @@ salt:
master_remove_config: true master_remove_config: true
# Set this to 'py3' to install the Python 3 packages. # Set this to 'py3' to install the Python 3 packages.
# If this is not set, the Python 2 packages will be installed by default. # The default varies between OS versions.
py_ver: 'py3' py_ver: 'py3'
# Set this to false to not have the formula install packages (in the case you # Set this to false to not have the formula install packages (in the case you

5
salt/osfamilymap.yaml
View File

@ -25,9 +25,8 @@
Debian: Debian:
pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] {{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main' pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] {{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/salt-archive-keyring.gpg'
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/salt-archive-keyring.gpg'
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
libgit2: libgit2-22 libgit2: libgit2-22
pyinotify: python-pyinotify pyinotify: python-pyinotify

4
salt/osmap.yaml
View File

@ -38,8 +38,8 @@ Ubuntu:
install_from_package: Null install_from_package: Null
Raspbian: Raspbian:
pkgrepo: 'deb {{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }} {{ oscodename }} main' 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'
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }}/salt-archive-keyring.gpg'
SmartOS: SmartOS:
salt_master: salt salt_master: salt

1
test/integration/v3001-py3/files/_mapdata/debian-10.yaml
View File

@ -42,7 +42,6 @@ values:
version: 0.23.0 version: 0.23.0
version: 0.22.1 version: 0.22.1
install_packages: true install_packages: true
key_url: https://repo.saltproject.io/py3/debian/10/amd64/3001/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar: ext_pillar:

1
test/integration/v3001-py3/files/_mapdata/debian-9.yaml
View File

@ -42,7 +42,6 @@ values:
version: 0.23.0 version: 0.23.0
version: 0.22.1 version: 0.22.1
install_packages: true install_packages: true
key_url: https://repo.saltproject.io/py3/debian/9/amd64/3001/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar: ext_pillar:

1
test/integration/v3002-py3/files/_mapdata/debian-10.yaml
View File

@ -42,7 +42,6 @@ values:
version: 0.23.0 version: 0.23.0
version: 0.22.1 version: 0.22.1
install_packages: true install_packages: true
key_url: https://repo.saltproject.io/py3/debian/10/amd64/3002/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar: ext_pillar:

1
test/integration/v3002-py3/files/_mapdata/debian-9.yaml
View File

@ -42,7 +42,6 @@ values:
version: 0.23.0 version: 0.23.0
version: 0.22.1 version: 0.22.1
install_packages: true install_packages: true
key_url: https://repo.saltproject.io/py3/debian/9/amd64/3002/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar: ext_pillar: