From 916bb2903bce33ccaf5ceb6b52278a187433c5d3 Mon Sep 17 00:00:00 2001 From: Justin Zandbergen Date: Thu, 25 Apr 2024 13:47:09 +0200 Subject: [PATCH] fix(pkgrepo): Debian, install keyring under appropriate name --- salt/osfamilymap.yaml | 3 ++- salt/pkgrepo/debian/install.sls | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml index dc34146..3ad3f29 100644 --- a/salt/osfamilymap.yaml +++ b/salt/osfamilymap.yaml @@ -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: diff --git a/salt/pkgrepo/debian/install.sls b/salt/pkgrepo/debian/install.sls index 21ac37a..1d05b41 100644 --- a/salt/pkgrepo/debian/install.sls +++ b/salt/pkgrepo/debian/install.sls @@ -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: