From 14e7e9c7bee561c70e1148cebe754a647bfe4efe Mon Sep 17 00:00:00 2001
From: Adrien Reslinger <adrien@reslinger.net>
Date: Wed, 19 Oct 2022 15:05:46 +0200
Subject: [PATCH] Fix linter issues

---
 meta/main.yml            |  16 ++---
 tasks/install_RedHat.yml |   4 +-
 tasks/main.yml           | 136 +++++++++++++++++++--------------------
 3 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/meta/main.yml b/meta/main.yml
index ecaedd3..794a113 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -6,11 +6,11 @@ galaxy_info:
   galaxy_tags: []
   license: GPL2
   platforms:
-  - name: CentOS
-    version:
-    - 7
-    - 8
-  - name: RedHat
-    version:
-    - 7
-    - 8
+    - name: CentOS
+      version:
+        - 7
+        - 8
+    - name: RedHat
+      version:
+        - 7
+        - 8
diff --git a/tasks/install_RedHat.yml b/tasks/install_RedHat.yml
index 5a59de6..f6a6f46 100644
--- a/tasks/install_RedHat.yml
+++ b/tasks/install_RedHat.yml
@@ -1,6 +1,6 @@
 ---
 - name: Install repositories packages for CentOS
-  package:
+  ansible.builtin.package:
     name:
       - epel-release
       - elrepo-release
@@ -11,7 +11,7 @@
     - ansible_distribution_major_version < "9"
 
 - name: Install kernel driver for WireGuard
-  package:
+  ansible.builtin.package:
     name:
       - kmod-wireguard
     state: present
diff --git a/tasks/main.yml b/tasks/main.yml
index 7a4cb53..a8f0ef3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,85 +1,85 @@
 ---
 - name: WireGuard setup
   block:
-  - name: Include vars for {{ ansible_os_family }}
-    include_vars: "{{ item }}"
-    with_first_found:
-      - "{{ ansible_os_family }}_{{ ansible_distribution_major_version }}.yml"
-      - "{{ ansible_os_family }}.yml"
+    - name: Include vars for {{ ansible_os_family }}
+      ansible.builtin.include_vars: "{{ item }}"
+      with_first_found:
+        - "{{ ansible_os_family }}_{{ ansible_distribution_major_version }}.yml"
+        - "{{ ansible_os_family }}.yml"
 
-  - name: Pre-installation
-    include_tasks: "install_{{ ansible_os_family }}.yml"
+    - name: Pre-installation
+      ansible.builtin.include_tasks: "install_{{ ansible_os_family }}.yml"
 
-  - name: Install packages for WireGuard
-    package:
-      name: "{{ wireguard_packages }}"
-      state: present
-      update_cache: true
+    - name: Install packages for WireGuard
+      ansible.builtin.package:
+        name: "{{ wireguard_packages }}"
+        state: present
+        update_cache: true
 
-  - name: Configure wireguard
-    block:
-    - name: Retreive private key
+    - name: Configure wireguard
       block:
       - name: Retreive private key
-        shell: >
-          cat /etc/wireguard/privatekey
-        register: wireguard_private_key
-        changed_when: false
-        check_mode: false
-      rescue:
-      - name: Generate private key
-        shell: >
-          set -o pipefail && wg genkey | tee /etc/wireguard/privatekey
-        register: wireguard_private_key
-      always:
-      - name: Fix permission on /etc/wireguard/privatekey
-        file:
-          path: "/etc/wireguard/privatekey"
-          owner: root
-          group: root
-          mode: 0600
+        block:
+          - name: Retreive private key
+            ansible.builtin.shell: >
+              cat /etc/wireguard/privatekey
+            register: wireguard_private_key
+            changed_when: false
+            check_mode: false
+        rescue:
+          - name: Generate private key
+            ansible.builtin.shell: >
+              set -o pipefail && wg genkey | tee /etc/wireguard/privatekey
+            register: wireguard_private_key
+        always:
+          - name: Fix permission on /etc/wireguard/privatekey
+            ansible.builtin.file:
+              path: "/etc/wireguard/privatekey"
+              owner: root
+              group: root
+              mode: 0600
 
-    - name: Retreive public key
-      block:
       - name: Retreive public key
-        shell: >
-          cat /etc/wireguard/publickey
-        register: wireguard_public_key
-        changed_when: false
+        block:
+          - name: Retreive public key
+            ansible.builtin.shell: >
+              cat /etc/wireguard/publickey
+            register: wireguard_public_key
+            changed_when: false
+            check_mode: false
+        rescue:
+          - name: Generate public key
+            ansible.builtin.shell: >
+              set -o pipefail && cat /etc/wireguard/privatekey | wg pubkey | tee /etc/wireguard/publickey
+            register: wireguard_public_key
+        always:
+          - name: Fix permission on /etc/wireguard/publickey
+            ansible.builtin.file:
+              path: "/etc/wireguard/publickey"
+              owner: root
+              group: root
+              mode: 0600
+
+      - name: Set keys pair variable
+        ansible.builtin.set_fact:
+          wireguard_public_key: '{{ wireguard_public_key.stdout }}'
+          wireguard_private_key: '{{ wireguard_private_key.stdout }}'
         check_mode: false
-      rescue:
-      - name: Generate public key
-        shell: >
-          set -o pipefail && cat /etc/wireguard/privatekey | wg pubkey | tee /etc/wireguard/publickey
-        register: wireguard_public_key
-      always:
-      - name: Fix permission on /etc/wireguard/publickey
-        file:
-          path: "/etc/wireguard/publickey"
+
+      - name: Install WireGuard configuration files
+        ansible.builtin.template:
+          src: "etc/wireguard/wireguard.conf.j2"
+          dest: "/etc/wireguard/{{ wireguard_interface }}.conf"
           owner: root
           group: root
-          mode: 0600
+          mode: 0644
+        notify: "reconfigure wireguard"
 
-    - name: Set keys pair variable
-      set_fact:
-        wireguard_public_key: '{{ wireguard_public_key.stdout }}'
-        wireguard_private_key: '{{ wireguard_private_key.stdout }}'
-      check_mode: false
-
-    - name: Install WireGuard configuration files
-      template:
-        src: "etc/wireguard/wireguard.conf.j2"
-        dest: "/etc/wireguard/{{ wireguard_interface }}.conf"
-        owner: root
-        group: root
-        mode: 0644
-      notify: "reconfigure wireguard"
-
-    - name: Enable Wireguard service
-      service:
-        name: "wg-quick@{{ wireguard_interface }}"
-        enabled: true
-        state: restarted
+      - name: Enable Wireguard service
+        ansible.builtin.service:
+          name: "wg-quick@{{ wireguard_interface }}"
+          enabled: true
+          state: restarted
     when:
       - not skip_conf
     tags: