various: ensure /etc/apt/keyrings exists prior to using it for signin…

…g keys
saltyorg · Jul 3, 2024 · 1d81bb5 · 1d81bb5
1 parent b8e90c8
commit 1d81bb5
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/roles/docker/tasks/subtasks/binary/binary.yml b/roles/docker/tasks/subtasks/binary/binary.yml
@@ -30,7 +30,15 @@
   ansible.builtin.apt:
     update_cache: yes
 
-- name: Binary | Add official gpg signing key to trusted.gpg.d
+- name: Binary | Ensure '/etc/apt/keyrings' exists
+  ansible.builtin.file:
+    path: "/etc/apt/keyrings"
+    state: directory
+    mode: "0755"
+    owner: "root"
+    group: "root"
+
+- name: Binary | Add official gpg signing key to '/etc/apt/keyrings'
   ansible.builtin.get_url:
     url: "{{ docker_apt_key_url }}"
     dest: /etc/apt/keyrings/docker.asc

diff --git a/roles/mainline/tasks/main.yml b/roles/mainline/tasks/main.yml
@@ -34,6 +34,14 @@
   ansible.builtin.apt:
     update_cache: yes
 
+- name: Ensure '/etc/apt/keyrings' exists
+  ansible.builtin.file:
+    path: "/etc/apt/keyrings"
+    state: directory
+    mode: "0755"
+    owner: "root"
+    group: "root"
+
 - name: Add gpg signing key to '/etc/apt/keyrings'
   ansible.builtin.get_url:
     url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3AE27527713D2479DCAFFD58A89D7C1B2F76304D

diff --git a/roles/python/tasks/main.yml b/roles/python/tasks/main.yml
@@ -45,6 +45,14 @@
   ansible.builtin.apt:
     update_cache: yes
 
+- name: Ensure '/etc/apt/keyrings' exists
+  ansible.builtin.file:
+    path: "/etc/apt/keyrings"
+    state: directory
+    mode: "0755"
+    owner: "root"
+    group: "root"
+
 - name: Add gpg signing key to '/etc/apt/keyrings'
   ansible.builtin.get_url:
     url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xF23C5A6CF475977595C89F51BA6932366A755776