diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml index e2e48a640..ca386bd55 100644 --- a/salt/osfamilymap.yaml +++ b/salt/osfamilymap.yaml @@ -23,11 +23,10 @@ {%- set rootuser = salt['cmd.run']("whoami").split("\\")[1] %} {%- endif %} - 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=/etc/apt/keyrings/salt-archive-keyring.gpg arch=amd64] {{ salt_repo }}/salt/{{ 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-archive-keyring.gpg' - pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 + pkgrepo_keyring_hash: sha256=c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472 libgit2: libgit2-22 pyinotify: python-pyinotify gitfs: diff --git a/salt/pkgrepo/debian/install.sls b/salt/pkgrepo/debian/install.sls index 21ac37ad7..751bf705b 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: /etc/apt/keyrings/salt-archive-keyring.gpg - source: {{ salt_settings.pkgrepo_keyring }} - source_hash: {{ salt_settings.pkgrepo_keyring_hash }} - require_in: