From 096a039f9308f2bbcbd8f3126f372332c2f40633 Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Sat, 24 Sep 2022 15:06:16 +0100
Subject: [PATCH] fixed lint

---
 .ansible-lint               |  1 +
 .github/workflows/lint.yml  |  1 -
 Makefile                    |  2 +-
 playbooks/setup-homelab.yml | 70 ++++++++++++++++++-------------------
 4 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/.ansible-lint b/.ansible-lint
index d62ccb2..8ccc65b 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -1,3 +1,4 @@
 skip_list:
   - '403' # allow for latest packages
   - name[casing]
+  - yaml[indentation]
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 3337c63..1923f8d 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -39,4 +39,3 @@ jobs:
       run: make deps
     - name: Format code
       run: make format
-
diff --git a/Makefile b/Makefile
index 2c60098..c43a7e0 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ lint-all:
 	make lint dir=playbooks
 
 lint:
-	ansible-lint $(dir) --exclude "roles/sprat.*" --exclude roles/docker_restore_container --exclude "roles/geerlingguy.*"
+	ansible-lint $(dir) --exclude "roles/sprat.*" --exclude roles/docker_restore_container --exclude "roles/geerlingguy.*" --exclude collections --exclude .github
 
 backup: deps
 	ansible-playbook playbooks/backup-docker-volumes.yml
diff --git a/playbooks/setup-homelab.yml b/playbooks/setup-homelab.yml
index 095ca00..ad5f66c 100644
--- a/playbooks/setup-homelab.yml
+++ b/playbooks/setup-homelab.yml
@@ -41,45 +41,45 @@
       ansible.builtin.include_vars: '../{{ vault_file }}'
       tags: [always]
   tasks:
-  - name: Install CIFS and other required packages for mounting with apt
-    apt:
-      name: "{{ item }}"
-      state: present
-    with_items:
-      - smbclient
-      - cifs-utils
+    - name: Install CIFS and other required packages for mounting with apt
+      ansible.builtin.apt:
+        name: "{{ item }}"
+        state: present
+      with_items:
+        - smbclient
+        - cifs-utils
 
-  - name: Check mountpoint exists.
-    ansible.builtin.file:
-      path: "/mnt/mergerfs"
-      state: directory
-      mode: '0777'
-      owner: root
-      group: root
+    - name: Check mountpoint exists.
+      ansible.builtin.file:
+        path: "/mnt/mergerfs"
+        state: directory
+        mode: '0777'
+        owner: root
+        group: root
 
-  - name: Check mountpoint exists.
-    ansible.builtin.file:
-      path: "/mnt/ssd0/downloads"
-      state: directory
-      mode: '0777'
-      owner: root
-      group: root
+    - name: Check mountpoint exists.
+      ansible.builtin.file:
+        path: "/mnt/ssd0/downloads"
+        state: directory
+        mode: '0777'
+        owner: root
+        group: root
 
-  - name: Mount shares.
-    mount:
-       state: "mounted"
-       fstype: "cifs"
-       path: /mnt/mergerfs
-       src: '//192.168.178.42/mergerfs'
-       opts: 'username=cianhatton,password={{ cianhatton_password }},dir_mode=0777,file_mode=0777,umask=0000'
+    - name: Mount shares.
+      mount:
+        state: "mounted"
+        fstype: "cifs"
+        path: /mnt/mergerfs
+        src: '//192.168.178.42/mergerfs'
+        opts: 'username=cianhatton,password={{ cianhatton_password }},dir_mode=0777,file_mode=0777,umask=0000'
 
-  - name: Mount shares.
-    mount:
-       state: "mounted"
-       fstype: "cifs"
-       path: /mnt/ssd0/downloads
-       src: '//192.168.178.42/downloads'
-       opts: 'username=cianhatton,password={{ cianhatton_password }},dir_mode=0777,file_mode=0777,umask=0000'
+    - name: Mount shares.
+      mount:
+        state: "mounted"
+        fstype: "cifs"
+        path: /mnt/ssd0/downloads
+        src: '//192.168.178.42/downloads'
+        opts: 'username=cianhatton,password={{ cianhatton_password }},dir_mode=0777,file_mode=0777,umask=0000'
 
 - name: Install Docker on Docker hosts.
   hosts: docker