From 965bec2314f7f28599425832f0bf71d843c6fa3b Mon Sep 17 00:00:00 2001 From: Adrien Waksberg Date: Tue, 7 May 2024 22:21:03 +0200 Subject: [PATCH] chore: replace apt_key to get_url --- CHANGELOG.md | 4 ++++ README.md | 1 - meta/main.yml | 1 - molecule/default/molecule.yml | 9 --------- tasks/main.yml | 14 +++++++++++--- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6d00fc..d179209 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/) - test: use personal docker registry +### Removed + +- test: remove support debian11 + ## v1.0.0 - 2021-08-18 ### Added diff --git a/README.md b/README.md index 9d925b4..29eea99 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ Install icingaweb2 - Ansible >= 2.9 - Debian - - Bulleyes - Bookworm ## Role variables diff --git a/meta/main.yml b/meta/main.yml index a5cad76..464a760 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -11,7 +11,6 @@ galaxy_info: platforms: - name: Debian versions: - - bullseye - bookworm galaxy_tags: diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 68f5223..e73cc9e 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -11,15 +11,6 @@ platforms: command: /bin/systemd capabilities: - SYS_ADMIN - - name: debian11 - image: code.waks.be/nishiki/molecule:debian11 - privileged: true - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - cgroupns_mode: host - command: /bin/systemd - capabilities: - - SYS_ADMIN lint: | set -e yamllint . diff --git a/tasks/main.yml b/tasks/main.yml index 51d7322..54027bf 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -5,14 +5,22 @@ - apt-transport-https tags: icingaweb2 -- name: Add key repository - ansible.builtin.apt_key: +- name: Add repository key + ansible.builtin.get_url: url: https://packages.icinga.com/icinga.key + dest: /etc/apt/keyrings/icinga.asc + owner: root + group: root + mode: 0644 + checksum: sha256:be677e07972ed57b99ffc2fd211379ac11b9c6a7c8d9460086b447b96b0a82bb tags: icingaweb2 - name: Add repository ansible.builtin.apt_repository: - repo: 'deb https://packages.icinga.com/debian icinga-{{ ansible_distribution_release }} main' + repo: >- + deb [signed-by=/etc/apt/keyrings/icinga.asc] + https://packages.icinga.com/debian icinga-{{ ansible_distribution_release }} main + filename: icinga tags: icingaweb2 - name: Install packages