Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2025-04-11 10:54:57 +02:00
Code Issues Activity

fix(pkgrepo): Debian, install keyring under appropriate name

Browse Source
This commit is contained in:
Justin Zandbergen 2024-04-25 13:47:09 +02:00
parent 0fb7e81b8b
commit 916bb2903b
No known key found for this signature in database
GPG Key ID: 2AA3406BA4B5EB37
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/osfamilymap.yaml
View File

@ -44,9 +44,10 @@
Debian:
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'
pkgrepo: 'deb [signed-by=/usr/share/keyrings/{{ salt_repo_keyring_filename }} arch=amd64] {{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/{{ salt_repo_keyring_filename }}' #' <- vim syntax highlight fix
pkgrepo_keyring_hash: {{ salt_repo_keyring_hash }}
pkgrepo_keyring_filename: {{ salt_repo_keyring_filename }}
libgit2: libgit2-22
pyinotify: python-pyinotify
gitfs:

2
salt/pkgrepo/debian/install.sls
View File

@ -4,7 +4,7 @@
salt-pkgrepo-install-saltstack-debian-keyring:
file.managed:
- name: /usr/share/keyrings/salt-archive-keyring.gpg
- name: /usr/share/keyrings/{{ salt_settings.pkgrepo_keyring_filename }}
- source: {{ salt_settings.pkgrepo_keyring }}
- source_hash: {{ salt_settings.pkgrepo_keyring_hash }}
- require_in: