diff --git a/defaults/main.yml b/defaults/main.yml index 6188998..fb8c053 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,6 @@ --- grafana_repo_key: https://apt.grafana.com/gpg.key -grafana_repo: "deb [signed-by=/usr/share/keyrings/grafana.key] https://apt.grafana.com stable main" +grafana_repo: "deb [signed-by=/etc/apt/keyrings/grafana.gpg] https://apt.grafana.com stable main" grafana_pkg_state: latest grafana_packages: - grafana diff --git a/tasks/main.yml b/tasks/main.yml index 1eee34a..7103984 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -16,14 +16,22 @@ when: grafana_enabled tags: [grafana] block: + - name: Create a directory to store the repo keys + ansible.builtin.file: + dest: /etc/apt/keyrings + state: directory + mode: "0755" + owner: root + group: root - name: Install the grafana repo key get_url: url: "{{ grafana_repo_key }}" - dest: /usr/share/keyrings/grafana.key + dest: /etc/apt/keyrings/grafana.gpg state: present owner: root group: root mode: 0644 + tags: [grafana, grafana_repo_key] - name: Install the grafana deb repository apt_repository: