Commit 47ab261b authored by Javier Bértoli's avatar Javier Bértoli
Browse files

fix(debian,ubuntu): rename repo file to match documentation

Also:

* add keyring file for the salt repo, due to `apt-key` deprecation
* remove old repository file
parent cd2a0bfd
......@@ -25,8 +25,10 @@
Debian:
pkgrepo: 'deb {{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] {{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/salt-archive-keyring.gpg'
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
libgit2: libgit2-22
pyinotify: python-pyinotify
gitfs:
......
......@@ -25,7 +25,9 @@ Amazon:
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/amazon/2/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
Ubuntu:
pkgrepo: 'deb {{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] {{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/salt-archive-keyring.gpg'
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
pygit2: python-pygit2
gitfs:
......
......@@ -6,8 +6,8 @@ salt-pkgrepo-clean-saltstack-debian:
pkgrepo.absent:
- name: {{ salt_settings.pkgrepo }}
file.absent:
- name: /etc/apt/sources.list.d/saltstack.list
- name: /etc/apt/sources.list.d/salt.list
salt-pkgrepo-clean-saltstack-debian-apt-key:
file.absent:
- name: /etc/apt/trusted.gpg.d/saltstack.gpg
- name: /usr/share/keyrings/salt-archive-keyring.gpg
......@@ -6,8 +6,8 @@ salt-pkgrepo-clean-saltstack-debian:
pkgrepo.absent:
- name: {{ salt_settings.pkgrepo }}
file.absent:
- name: /etc/apt/sources.list.d/saltstack.list
- name: /etc/apt/sources.list.d/salt.list
salt-pkgrepo-clean-saltstack-debian-apt-key:
file.absent:
- name: /etc/apt/trusted.gpg.d/saltstack.gpg
- name: /usr/share/keyrings/salt-archive-keyring.gpg
......@@ -2,13 +2,27 @@
# vim: ft=sls
{% from "salt/map.jinja" import salt_settings with context %}
salt-pkgrepo-install-saltstack-debian-keyring:
file.managed:
- name: /usr/share/keyrings/salt-archive-keyring.gpg
- source: {{ salt_settings.pkgrepo_keyring }}
- source_hash: {{ salt_settings.pkgrepo_keyring_hash }}
- require_in:
- pkgrepo: salt-pkgrepo-install-saltstack-debian
salt-pkgrepo-install-saltstack-debian-remove-old-repo-file:
file.absent:
- name: /etc/apt/sources.list.d/saltstack.list
- require_in:
- pkgrepo: salt-pkgrepo-install-saltstack-debian
salt-pkgrepo-install-saltstack-debian:
pkgrepo.managed:
- humanname: SaltStack Debian Repo
- name: {{ salt_settings.pkgrepo }}
- file: /etc/apt/sources.list.d/saltstack.list
- file: /etc/apt/sources.list.d/salt.list
- key_url: {{ salt_settings.key_url }}
- clean_file: True
# Order: 1 because we can't put a require_in on "pkg: salt-{master,minion}"
# Order: 3 because we can't put a require_in on "pkg: salt-{master,minion}"
# because we don't know if they are used.
- order: 1
- order: 3
......@@ -86,7 +86,10 @@ values:
state: running
parallel: true
pin_version: false
pkgrepo: deb https://repo.saltproject.io/apt/ubuntu/18.04/amd64/3000 bionic main
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/apt/ubuntu/18.04/amd64/3000 bionic main
pkgrepo_keyring: https://repo.saltproject.io/apt/ubuntu/18.04/amd64/3000/salt-archive-keyring.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
py_ver: ''
pygit2: python-pygit2
pyinotify: python-pyinotify
......
......@@ -86,7 +86,10 @@ values:
state: running
parallel: true
pin_version: false
pkgrepo: deb https://repo.saltproject.io/py3/debian/10/amd64/3000 buster main
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/debian/10/amd64/3000 buster main
pkgrepo_keyring: https://repo.saltproject.io/py3/debian/10/amd64/3000/salt-archive-keyring.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
py_ver: py3
pyinotify: python-pyinotify
python_dulwich: python-dulwich
......
......@@ -86,7 +86,10 @@ values:
state: running
parallel: true
pin_version: false
pkgrepo: deb https://repo.saltproject.io/py3/debian/9/amd64/3000 stretch main
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/debian/9/amd64/3000 stretch main
pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3000/salt-archive-keyring.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
py_ver: py3
pyinotify: python-pyinotify
python_dulwich: python-dulwich
......
......@@ -86,7 +86,10 @@ values:
state: running
parallel: true
pin_version: false
pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3000 bionic main
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3000 bionic main
pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3000/salt-archive-keyring.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
py_ver: py3
pygit2: python-pygit2
pyinotify: python-pyinotify
......
......@@ -86,7 +86,10 @@ values:
state: running
parallel: true
pin_version: false
pkgrepo: deb https://repo.saltproject.io/py3/debian/10/amd64/3001 buster main
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/debian/10/amd64/3001 buster main
pkgrepo_keyring: https://repo.saltproject.io/py3/debian/10/amd64/3001/salt-archive-keyring.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
py_ver: py3
pyinotify: python-pyinotify
python_dulwich: python-dulwich
......
......@@ -86,7 +86,10 @@ values:
state: running
parallel: true
pin_version: false
pkgrepo: deb https://repo.saltproject.io/py3/debian/9/amd64/3001 stretch main
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/debian/9/amd64/3001 stretch main
pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3001/salt-archive-keyring.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
py_ver: py3
pyinotify: python-pyinotify
python_dulwich: python-dulwich
......
......@@ -48,8 +48,8 @@ values:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots:
......@@ -86,7 +86,10 @@ values:
state: running
parallel: true
pin_version: false
pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3001 bionic main
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3001 bionic main
pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3001/salt-archive-keyring.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
py_ver: py3
pygit2: python-pygit2
pyinotify: python-pyinotify
......
......@@ -86,7 +86,10 @@ values:
state: running
parallel: true
pin_version: false
pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3001 focal main
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3001 focal main
pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3001/salt-archive-keyring.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
py_ver: py3
pygit2: python-pygit2
pyinotify: python-pyinotify
......
......@@ -86,7 +86,10 @@ values:
state: running
parallel: true
pin_version: false
pkgrepo: deb https://repo.saltproject.io/py3/debian/10/amd64/3002 buster main
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/debian/10/amd64/3002 buster main
pkgrepo_keyring: https://repo.saltproject.io/py3/debian/10/amd64/3002/salt-archive-keyring.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
py_ver: py3
pyinotify: python-pyinotify
python_dulwich: python-dulwich
......
......@@ -86,7 +86,10 @@ values:
state: running
parallel: true
pin_version: false
pkgrepo: deb https://repo.saltproject.io/py3/debian/9/amd64/3002 stretch main
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/debian/9/amd64/3002 stretch main
pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3002/salt-archive-keyring.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
py_ver: py3
pyinotify: python-pyinotify
python_dulwich: python-dulwich
......
......@@ -86,7 +86,10 @@ values:
state: running
parallel: true
pin_version: false
pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3002 bionic main
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3002 bionic main
pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3002/salt-archive-keyring.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
py_ver: py3
pygit2: python-pygit2
pyinotify: python-pyinotify
......
......@@ -86,7 +86,10 @@ values:
state: running
parallel: true
pin_version: false
pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3002 focal main
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3002 focal main
pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3002/salt-archive-keyring.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
py_ver: py3
pygit2: python-pygit2
pyinotify: python-pyinotify
......
......@@ -86,7 +86,10 @@ values:
state: running
parallel: true
pin_version: false
pkgrepo: deb https://repo.saltproject.io/py3/debian/10/amd64/3003 buster main
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/debian/10/amd64/3003 buster main
pkgrepo_keyring: https://repo.saltproject.io/py3/debian/10/amd64/3003/salt-archive-keyring.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
py_ver: py3
pyinotify: python-pyinotify
python_dulwich: python-dulwich
......
......@@ -86,7 +86,10 @@ values:
state: running
parallel: true
pin_version: false
pkgrepo: deb https://repo.saltproject.io/py3/debian/9/amd64/3003 stretch main
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/debian/9/amd64/3003 stretch main
pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3003/salt-archive-keyring.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
py_ver: py3
pyinotify: python-pyinotify
python_dulwich: python-dulwich
......
......@@ -86,7 +86,10 @@ values:
state: running
parallel: true
pin_version: false
pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3003 bionic main
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3003 bionic main
pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3003/salt-archive-keyring.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
py_ver: py3
pygit2: python-pygit2
pyinotify: python-pyinotify
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment