Browse Source

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

pull/564/head
Justin Zandbergen 7 months ago
parent
commit
916bb2903b
No account linked to committer's email address
2 changed files with 3 additions and 2 deletions
  1. +2
    -1
      salt/osfamilymap.yaml
  2. +1
    -1
      salt/pkgrepo/debian/install.sls

+ 2
- 1
salt/osfamilymap.yaml View File





Debian: 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: '{{ 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_hash: {{ salt_repo_keyring_hash }}
pkgrepo_keyring_filename: {{ salt_repo_keyring_filename }}
libgit2: libgit2-22 libgit2: libgit2-22
pyinotify: python-pyinotify pyinotify: python-pyinotify
gitfs: gitfs:

+ 1
- 1
salt/pkgrepo/debian/install.sls View File



salt-pkgrepo-install-saltstack-debian-keyring: salt-pkgrepo-install-saltstack-debian-keyring:
file.managed: 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: {{ salt_settings.pkgrepo_keyring }}
- source_hash: {{ salt_settings.pkgrepo_keyring_hash }} - source_hash: {{ salt_settings.pkgrepo_keyring_hash }}
- require_in: - require_in:

Loading…
Cancel
Save