diff options
Diffstat (limited to 'roles/apt-repo')
28 files changed, 35 insertions, 149 deletions
diff --git a/roles/apt-repo/aptly/tasks/main.yml b/roles/apt-repo/aptly/tasks/main.yml index 11f3d44f..3bb7d4c1 100644 --- a/roles/apt-repo/aptly/tasks/main.yml +++ b/roles/apt-repo/aptly/tasks/main.yml @@ -5,12 +5,6 @@ dest: /etc/apt/keyrings/aptly.gpg register: apt_repo_aptly_key -## TODO: remove once all servers have been converted -- name: remove repository key from old location - file: - path: /etc/apt/trusted.gpg.d/aptly.gpg - state: absent - - name: add repository entry copy: content: | diff --git a/roles/apt-repo/base/tasks/main.yml b/roles/apt-repo/base/tasks/main.yml index 668f6453..27050b40 100644 --- a/roles/apt-repo/base/tasks/main.yml +++ b/roles/apt-repo/base/tasks/main.yml @@ -13,6 +13,11 @@ path: "/etc/apt/sources.list.d/{{ item }}" state: absent +- name: remove seperate raspi.list file (repo is part of the base config) + file: + path: "/etc/apt/sources.list.d/raspi.list" + state: absent + - name: update apt cache when: apt_repo_base_sources is changed command: apt-get update diff --git a/roles/apt-repo/base/templates/Debian.list.j2 b/roles/apt-repo/base/templates/Debian.list.j2 index 91531f7e..d29ced50 100644 --- a/roles/apt-repo/base/templates/Debian.list.j2 +++ b/roles/apt-repo/base/templates/Debian.list.j2 @@ -5,3 +5,6 @@ deb http://{{ apt_repo_providers[apt_repo_provider].debian_security.host }}{{ ap {% else %} deb http://{{ apt_repo_providers[apt_repo_provider].debian_security.host }}{{ apt_repo_providers[apt_repo_provider].debian_security.path }} {{ ansible_distribution_release }}-security {{ apt_repo_components | default(apt_repo_base_components.debian) | join(' ') }} {% endif %} +{% if 'raspios' in group_names %} +deb http://{{ apt_repo_providers[apt_repo_provider].raspios.host }}{{ apt_repo_providers[apt_repo_provider].raspios.path }} {{ ansible_distribution_release }} main +{% endif %} diff --git a/roles/apt-repo/blackmagic/tasks/main.yml b/roles/apt-repo/blackmagic/tasks/main.yml index e376fe9f..a6060e36 100644 --- a/roles/apt-repo/blackmagic/tasks/main.yml +++ b/roles/apt-repo/blackmagic/tasks/main.yml @@ -5,16 +5,6 @@ dest: /etc/apt/keyrings/spreadspace.gpg register: apt_repo_blackmagic_key -## TODO: remove once all servers have been converted -- name: remove repository key from old locations - loop: - - /etc/apt/trusted.gpg.d/blackmagic.gpg - - /etc/apt/keyrings/blackmagic.gpg - file: - path: "{{ item }}" - state: absent - - - name: configure repo authentication when: - ansible_distribution == "Debian" diff --git a/roles/apt-repo/docker-com/defaults/main.yml b/roles/apt-repo/docker-com/defaults/main.yml new file mode 100644 index 00000000..a075c9cc --- /dev/null +++ b/roles/apt-repo/docker-com/defaults/main.yml @@ -0,0 +1,2 @@ +--- +docker_com_apt_repo_baseurl: "https://download.docker.com/linux" diff --git a/roles/apt-repo/docker-com/tasks/main.yml b/roles/apt-repo/docker-com/tasks/main.yml index c63fdb37..648196f7 100644 --- a/roles/apt-repo/docker-com/tasks/main.yml +++ b/roles/apt-repo/docker-com/tasks/main.yml @@ -5,16 +5,10 @@ dest: /etc/apt/keyrings/docker-com.gpg register: apt_repo_docker_com_key -## TODO: remove once all servers have been converted -- name: remove repository key from old location - file: - path: /etc/apt/trusted.gpg.d/docker-com.gpg - state: absent - - name: add repository entry copy: content: | - deb [signed-by=/etc/apt/keyrings/docker-com.gpg] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable + deb [signed-by=/etc/apt/keyrings/docker-com.gpg] {{ docker_com_apt_repo_baseurl }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable dest: /etc/apt/sources.list.d/docker-com.list register: apt_repo_docker_com_sources diff --git a/roles/apt-repo/element/tasks/main.yml b/roles/apt-repo/element/tasks/main.yml index 6971baab..1f856500 100644 --- a/roles/apt-repo/element/tasks/main.yml +++ b/roles/apt-repo/element/tasks/main.yml @@ -5,16 +5,6 @@ dest: /etc/apt/keyrings/element.gpg register: apt_repo_element_key -## TODO: remove once all servers have been converted -- name: remove repository key from old location - loop: - - /etc/apt/trusted.gpg.d/element.gpg - - /etc/apt/keyrings/riot.gpg - - /etc/apt/sources.list.d/riot.list - file: - path: "{{ item }}" - state: absent - - name: add repository entry copy: content: | diff --git a/roles/apt-repo/freecad/files/repo.gpg b/roles/apt-repo/freecad/files/repo.gpg Binary files differdeleted file mode 100644 index 79cc23e8..00000000 --- a/roles/apt-repo/freecad/files/repo.gpg +++ /dev/null diff --git a/roles/apt-repo/freecad/tasks/main.yml b/roles/apt-repo/freecad/tasks/main.yml deleted file mode 100644 index 2f6f48e1..00000000 --- a/roles/apt-repo/freecad/tasks/main.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- name: add repository key - copy: - src: repo.gpg - dest: /etc/apt/keyrings/freecad.gpg - register: apt_repo_freecad_key - -- name: add repository entry - copy: - content: | - deb [signed-by=/etc/apt/keyrings/freecad.gpg] https://ppa.launchpadcontent.net/freecad-maintainers/freecad-stable/ubuntu {{ ansible_distribution_release }} main - dest: /etc/apt/sources.list.d/freecad.list - register: apt_repo_freecad_sources - -- name: update apt cache - when: apt_repo_freecad_key is changed or - apt_repo_freecad_sources is changed - command: apt-get update diff --git a/roles/apt-repo/grafana/tasks/main.yml b/roles/apt-repo/grafana/tasks/main.yml index f5bf1275..1b3f10c6 100644 --- a/roles/apt-repo/grafana/tasks/main.yml +++ b/roles/apt-repo/grafana/tasks/main.yml @@ -5,12 +5,6 @@ dest: /etc/apt/keyrings/grafana.gpg register: apt_repo_grafana_key -## TODO: remove once all servers have been converted -- name: remove repository key from old location - file: - path: /etc/apt/trusted.gpg.d/grafana.gpg - state: absent - - name: add repository entry copy: content: | diff --git a/roles/apt-repo/helsinki/tasks/main.yml b/roles/apt-repo/helsinki/tasks/main.yml index fd8ac760..40e011ea 100644 --- a/roles/apt-repo/helsinki/tasks/main.yml +++ b/roles/apt-repo/helsinki/tasks/main.yml @@ -5,12 +5,6 @@ dest: /etc/apt/keyrings/helsinki.gpg register: apt_repo_helsinki_key -## TODO: remove once all servers have been converted -- name: remove repository key from old location - file: - path: /etc/apt/trusted.gpg.d/helsinki.gpg - state: absent - - name: add repository entry copy: content: | diff --git a/roles/apt-repo/kicad6/files/repo.gpg b/roles/apt-repo/kicad6/files/repo.gpg Binary files differdeleted file mode 100644 index 274698cd..00000000 --- a/roles/apt-repo/kicad6/files/repo.gpg +++ /dev/null diff --git a/roles/apt-repo/kicad6/tasks/main.yml b/roles/apt-repo/kicad6/tasks/main.yml deleted file mode 100644 index 7eea235e..00000000 --- a/roles/apt-repo/kicad6/tasks/main.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- name: add repository key - copy: - src: repo.gpg - dest: /etc/apt/keyrings/kicad6.gpg - register: apt_repo_kicad6_key - -- name: add repository entry - copy: - content: | - deb [signed-by=/etc/apt/keyrings/kicad6.gpg] https://ppa.launchpadcontent.net/kicad/kicad-6.0-releases/ubuntu {{ ansible_distribution_release }} main - dest: /etc/apt/sources.list.d/kicad6.list - register: apt_repo_kicad6_sources - -- name: update apt cache - when: apt_repo_kicad6_key is changed or - apt_repo_kicad6_sources is changed - command: apt-get update diff --git a/roles/apt-repo/kodi/tasks/main.yml b/roles/apt-repo/kodi/tasks/main.yml index f6fcbc5f..c7938b0d 100644 --- a/roles/apt-repo/kodi/tasks/main.yml +++ b/roles/apt-repo/kodi/tasks/main.yml @@ -5,12 +5,6 @@ dest: /etc/apt/keyrings/kodi.gpg register: apt_repo_kodi_key -## TODO: remove once all servers have been converted -- name: remove repository key from old location - file: - path: /etc/apt/trusted.gpg.d/kodi.gpg - state: absent - - name: add repository entry copy: content: | diff --git a/roles/apt-repo/kubernetes/defaults/main.yml b/roles/apt-repo/kubernetes/defaults/main.yml new file mode 100644 index 00000000..486c457a --- /dev/null +++ b/roles/apt-repo/kubernetes/defaults/main.yml @@ -0,0 +1,2 @@ +--- +kubernetes_apt_repo_baseurl: "https://pkgs.k8s.io/core:/stable:" diff --git a/roles/apt-repo/kubernetes/tasks/main.yml b/roles/apt-repo/kubernetes/tasks/main.yml index e2f0444b..9198cb10 100644 --- a/roles/apt-repo/kubernetes/tasks/main.yml +++ b/roles/apt-repo/kubernetes/tasks/main.yml @@ -8,7 +8,7 @@ - name: add repository entry copy: content: | - deb [signed-by=/etc/apt/keyrings/kubernetes.gpg] https://pkgs.k8s.io/core:/stable:/v{{ ([0, 1] | map('extract', kubernetes_version.split('.'))) | join('.') }}/deb/ / + deb [signed-by=/etc/apt/keyrings/kubernetes.gpg] {{ kubernetes_apt_repo_baseurl }}/v{{ ([0, 1] | map('extract', kubernetes_version.split('.'))) | join('.') }}/deb/ / dest: /etc/apt/sources.list.d/kubernetes.list register: apt_repo_kubernetes_sources diff --git a/roles/apt-repo/kubic-project/files/repo.gpg b/roles/apt-repo/kubic-project/files/repo.gpg Binary files differdeleted file mode 100644 index 9b827ee8..00000000 --- a/roles/apt-repo/kubic-project/files/repo.gpg +++ /dev/null diff --git a/roles/apt-repo/kubic-project/tasks/main.yml b/roles/apt-repo/kubic-project/tasks/main.yml deleted file mode 100644 index 386815bc..00000000 --- a/roles/apt-repo/kubic-project/tasks/main.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- name: add repository key - copy: - src: repo.gpg - dest: /etc/apt/keyrings/kubic-project.gpg - register: apt_repo_kubic_project_key - -## TODO: remove once all servers have been converted -- name: remove repository key from old location - file: - path: /etc/apt/trusted.gpg.d/kubic-project.gpg - state: absent - -- name: add repository entry - copy: - content: | - deb [signed-by=/etc/apt/keyrings/kubic-project.gpg] http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/{{ (ansible_distribution == 'Ubuntu') | ternary('xUbuntu', ansible_distribution) }}_{{ ansible_distribution_version }}/ / - dest: /etc/apt/sources.list.d/kubic-project.list - register: apt_repo_kubic_project_sources - -- name: update apt cache - when: apt_repo_kubic_project_key is changed or - apt_repo_kubic_project_sources is changed - command: apt-get update diff --git a/roles/apt-repo/nodejs/tasks/main.yml b/roles/apt-repo/nodejs/tasks/main.yml index 5c59cf5a..69af27a1 100644 --- a/roles/apt-repo/nodejs/tasks/main.yml +++ b/roles/apt-repo/nodejs/tasks/main.yml @@ -5,12 +5,6 @@ dest: /etc/apt/keyrings/nodejs.gpg register: apt_repo_nodejs_key -## TODO: remove once all servers have been converted -- name: remove repository key from old location - file: - path: /etc/apt/trusted.gpg.d/nodejs.gpg - state: absent - - name: add repository entry copy: content: | diff --git a/roles/apt-repo/nordvpn/tasks/main.yml b/roles/apt-repo/nordvpn/tasks/main.yml index 32711ad0..923c2fb0 100644 --- a/roles/apt-repo/nordvpn/tasks/main.yml +++ b/roles/apt-repo/nordvpn/tasks/main.yml @@ -5,12 +5,6 @@ dest: /etc/apt/keyrings/nordvpn.gpg register: apt_repo_nordvpn_key -## TODO: remove once all servers have been converted -- name: remove repository key from old location - file: - path: /etc/apt/trusted.gpg.d/nordvpn.gpg - state: absent - - name: add repository entry copy: content: | diff --git a/roles/apt-repo/obs-studio/tasks/main.yml b/roles/apt-repo/obs-studio/tasks/main.yml index e3933596..9a966268 100644 --- a/roles/apt-repo/obs-studio/tasks/main.yml +++ b/roles/apt-repo/obs-studio/tasks/main.yml @@ -5,12 +5,6 @@ dest: /etc/apt/keyrings/obs-studio.gpg register: apt_repo_obs_studio_key -## TODO: remove once all servers have been converted -- name: remove repository key from old location - file: - path: /etc/apt/trusted.gpg.d/obs-studio.gpg - state: absent - - name: add repository entry copy: content: | diff --git a/roles/apt-repo/percona/tasks/main.yml b/roles/apt-repo/percona/tasks/main.yml index 59f7f2a9..51ed9426 100644 --- a/roles/apt-repo/percona/tasks/main.yml +++ b/roles/apt-repo/percona/tasks/main.yml @@ -5,12 +5,6 @@ dest: /etc/apt/keyrings/percona.gpg register: apt_repo_percona_key -## TODO: remove once all servers have been converted -- name: remove repository key from old location - file: - path: /etc/apt/trusted.gpg.d/percona.gpg - state: absent - - name: add repository entry copy: content: | diff --git a/roles/apt-repo/qmk/files/repo.gpg b/roles/apt-repo/qmk/files/repo.gpg Binary files differnew file mode 100644 index 00000000..b9c59a08 --- /dev/null +++ b/roles/apt-repo/qmk/files/repo.gpg diff --git a/roles/apt-repo/qmk/tasks/main.yml b/roles/apt-repo/qmk/tasks/main.yml new file mode 100644 index 00000000..90bb9c9f --- /dev/null +++ b/roles/apt-repo/qmk/tasks/main.yml @@ -0,0 +1,18 @@ +--- +- name: add repository key + copy: + src: repo.gpg + dest: /etc/apt/keyrings/qmk.gpg + register: apt_repo_qmk_key + +- name: add repository entry + copy: + content: | + deb [signed-by=/etc/apt/keyrings/qmk.gpg] https://linux.qmk.fm/ {{ ansible_distribution_release }} main + dest: /etc/apt/sources.list.d/qmk.list + register: apt_repo_qmk_sources + +- name: update apt cache + when: apt_repo_qmk_key is changed or + apt_repo_qmk_sources is changed + command: apt-get update diff --git a/roles/apt-repo/spreadspace/defaults/main.yml b/roles/apt-repo/spreadspace/defaults/main.yml index 4a497ae4..0de65a6a 100644 --- a/roles/apt-repo/spreadspace/defaults/main.yml +++ b/roles/apt-repo/spreadspace/defaults/main.yml @@ -1,3 +1,5 @@ --- +spreadspace_apt_repo_baseurl: "https://build.spreadspace.org/" + spreadspace_apt_repo_components: - main diff --git a/roles/apt-repo/spreadspace/tasks/main.yml b/roles/apt-repo/spreadspace/tasks/main.yml index 0b4dac67..4c789efd 100644 --- a/roles/apt-repo/spreadspace/tasks/main.yml +++ b/roles/apt-repo/spreadspace/tasks/main.yml @@ -5,16 +5,10 @@ dest: /etc/apt/keyrings/spreadspace.gpg register: apt_repo_spreadspace_key -## TODO: remove once all servers have been converted -- name: remove repository key from old location - file: - path: /etc/apt/trusted.gpg.d/spreadspace.gpg - state: absent - - name: add repository entry copy: content: | - deb [signed-by=/etc/apt/keyrings/spreadspace.gpg] https://build.spreadspace.org/ {{ ansible_distribution_release }} {{ spreadspace_apt_repo_components | join(' ') }} + deb [signed-by=/etc/apt/keyrings/spreadspace.gpg] {{ spreadspace_apt_repo_baseurl }} {{ ansible_distribution_release }} {{ spreadspace_apt_repo_components | join(' ') }} dest: /etc/apt/sources.list.d/spreadspace.list register: apt_repo_spreadspace_sources diff --git a/roles/apt-repo/tor-project/files/repo.gpg b/roles/apt-repo/tor-project/files/repo.gpg Binary files differindex 7614b203..738ef5d7 100644 --- a/roles/apt-repo/tor-project/files/repo.gpg +++ b/roles/apt-repo/tor-project/files/repo.gpg diff --git a/roles/apt-repo/tor-project/tasks/main.yml b/roles/apt-repo/tor-project/tasks/main.yml index 6f465016..7c1669bc 100644 --- a/roles/apt-repo/tor-project/tasks/main.yml +++ b/roles/apt-repo/tor-project/tasks/main.yml @@ -5,12 +5,6 @@ dest: /etc/apt/keyrings/tor-project.gpg register: apt_repo_tor_project_key -## TODO: remove once all servers have been converted -- name: remove repository key from old location - file: - path: /etc/apt/trusted.gpg.d/tor-project.gpg - state: absent - - name: add repository entry copy: content: | |