move a lot of configuration around

tasks/pkgs/hashicorp_repo.yml

@@ -1,12 +1,14 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.set_fact:
+- name: Set hashicorp flag
+  ansible.builtin.set_fact:
     hashicorp: true
 
 - name: RedHat repository
-  when: ansible_os_family == 'RedHat'
+  when:
+    - ansible_os_family == 'RedHat'
   block:
-    - name: enable hashicorp repo for fedora >=41
+    - name: Enable hashicorp repo for fedora >=41
       become: true
       when:
         - ansible_distribution == 'Fedora'
@@ -15,7 +17,7 @@
         creates: /etc/yum.repos.d/hashicorp.repo
         cmd: "dnf config-manager addrepo --from-repofile={{ pkgconfig.hashicorp.Linux.Fedora.repo }}"
 
-    - name: enable hashicorp repo for fedora <41
+    - name: Enable hashicorp repo for fedora <41
       become: true
       when:
         - ansible_distribution == 'Fedora'
@@ -24,7 +26,7 @@
         creates: /etc/yum.repos.d/hashicorp.repo
         cmd: "dnf config-manager --add-repo {{ pkgconfig.hashicorp.Linux.Fedora.repo }}"
 
-    - name: enable hashicorp repo for RHEL like distribution
+    - name: Enable hashicorp repo for RHEL like distribution
       become: true
       when:
         - ansible_distribution != 'Fedora'
@@ -33,21 +35,25 @@
         cmd: "dnf config-manager --add-repo {{ pkgconfig.hashicorp.Linux.RedHat.repo }}"
 
 - name: Debian based repository
-  when: ansible_os_family == 'Debian'
+  when:
+    - ansible_os_family == 'Debian'
   block:
-    - ansible.builtin.tempfile:
+    - name: Create temporary directory
+      ansible.builtin.tempfile:
         state: directory
         prefix: hashicorp.
       register: d_hashicorp_tmp
 
-    - name: get hashicorp archive gpg key
+    - name: Get hashicorp archive gpg key
       ansible.builtin.get_url:
         dest: "{{ d_hashicorp_tmp.path }}/gpg"
         url: https://apt.releases.hashicorp.com/gpg
+        mode: '0644'
 
-    - name: install hashicorp archive gpg key
+    - name: Install hashicorp archive gpg key
       become: true
       ansible.builtin.command:
+        creates: /usr/share/keyrings/hashicorp-archive-keyring.gpg
         cmd:
           - gpg
           - --dearmor
@@ -55,13 +61,17 @@
           - /usr/share/keyrings/hashicorp-archive-keyring.gpg
           - "{{ d_hashicorp_tmp.path }}/gpg"
 
-    - name: enable hasicorp repo for debian
+    - name: Enable hasicorp repo for debian
       ansible.builtin.apt_repository:
         repo: "{{ pkgconfig.hashicorp.Linux.Debian.repo }}"
         state: present
         update_cache: false
 
-- name: enable hashicorp homebrew tap
-  when: ansible_os_family == 'Darwin'
-  ansible.builtin.set_fact:
-    brewtaps: "{{ brewtaps + ['hashicorp/tap'] }}"
+- name: MacOS specific configuration
+  when:
+    - ansible_distribution == 'MacOSX'
+  block:
+    - name: Enable hashicorp homebrew tap
+      when: ansible_os_family == 'Darwin'
+      ansible.builtin.set_fact:
+        brewtaps: "{{ brewtaps + ['hashicorp/tap'] }}"