Quellcode durchsuchen

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

pull/564/head
Justin Zandbergen vor 7 Monaten
Ursprung
Commit
916bb2903b
Es ist kein Account mit der E-Mail-Adresse des Committers verbunden
2 geänderte Dateien mit 3 neuen und 2 gelöschten Zeilen
  1. +2
    -1
      salt/osfamilymap.yaml
  2. +1
    -1
      salt/pkgrepo/debian/install.sls

+ 2
- 1
salt/osfamilymap.yaml Datei anzeigen

@@ -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:

+ 1
- 1
salt/pkgrepo/debian/install.sls Datei anzeigen

@@ -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:

Laden…
Abbrechen
Speichern