From 6bfa1d276c73da5dfbb8dde029de29de4a61ef1b Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Sun, 7 Feb 2021 13:56:58 +0000
Subject: [PATCH] Use ansible collections

---
 .ansible-lint           |  4 ++++
 .gitignore              |  1 +
 ansible.cfg             |  1 +
 galaxy-requirements.yml | 11 ++++++++---
 scripts/deploy.sh       |  2 +-
 scripts/lint.sh         |  2 +-
 tasks/security.yml      |  5 ++---
 yamllint.yml            |  4 ++++
 8 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/.ansible-lint b/.ansible-lint
index 7fadcd3..4928b51 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -3,3 +3,7 @@ skip_list:
   - 401
   - 301
   - 503
+
+exclude_paths:
+  - galaxy_roles/
+  - galaxy_collections/
diff --git a/.gitignore b/.gitignore
index 615dde9..c44d99a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.retry
 env/
 galaxy_roles/
+galaxy_collections/
diff --git a/ansible.cfg b/ansible.cfg
index d02dcdc..679309a 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -3,6 +3,7 @@ nocows = 1
 host_key_checking = False
 retry_files_enabled = False
 roles_path = ./galaxy_roles:./roles
+collections_path = ./galaxy_collections
 inventory = ./hosts
 become_ask_pass = True
 interpreter_python = /usr/bin/python3
diff --git a/galaxy-requirements.yml b/galaxy-requirements.yml
index fcba5bd..c6e04a9 100644
--- a/galaxy-requirements.yml
+++ b/galaxy-requirements.yml
@@ -1,3 +1,8 @@
-- src: kewlfft.aur
-- src: geerlingguy.ntp
-- src: realorangeone.reflector
+collections:
+  - ansible.posix
+  - community.general
+
+roles:
+  - src: kewlfft.aur
+  - src: geerlingguy.ntp
+  - src: realorangeone.reflector
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index a4ab9a4..c4aa587 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -2,4 +2,4 @@
 
 set -ex
 
-sudo env/bin/ansible-playbook dotfiles.yml
+time sudo ansible-playbook dotfiles.yml
diff --git a/scripts/lint.sh b/scripts/lint.sh
index d7ef622..9b46b74 100755
--- a/scripts/lint.sh
+++ b/scripts/lint.sh
@@ -8,6 +8,6 @@ set -x
 
 yamllint -sc yamllint.yml yamllint.yml dotfiles.yml tasks/ vars.yml
 
-ansible-lint dotfiles.yml -p -c .ansible-lint --exclude galaxy_roles/
+ansible-lint dotfiles.yml -p -c .ansible-lint
 
 ansible-playbook dotfiles.yml --syntax-check
diff --git a/tasks/security.yml b/tasks/security.yml
index 1f29a31..8a32056 100644
--- a/tasks/security.yml
+++ b/tasks/security.yml
@@ -18,7 +18,6 @@
     path: "{{ home }}/.ssh"
     owner: "{{ user }}"
     mode: 0700
-    directory_mode: 0700
 
 - name: Install assh config
   copy:
@@ -53,7 +52,7 @@
   register: firewall_ports
 
 - name: Open firewall ports
-  firewalld:
+  ansible.posix.firewalld:
     port: "{{ item }}"
     permanent: true
     immediate: true
@@ -61,7 +60,7 @@
   loop: "{{ requested_firewall_ports }}"
 
 - name: Close firewall ports
-  firewalld:
+  ansible.posix.firewalld:
     port: "{{ item }}"
     permanent: true
     immediate: true
diff --git a/yamllint.yml b/yamllint.yml
index 410bd7a..e26e116 100644
--- a/yamllint.yml
+++ b/yamllint.yml
@@ -8,3 +8,7 @@ rules:
     required: only-when-needed
   line-length:
     max: 150
+
+ignore: |
+  galaxy_roles
+  galaxy_collections