From 4dba716b3e4670566de05bb76a71e758e03307a1 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 14 Apr 2023 17:33:29 -0400
Subject: [PATCH] Switch to using dkms zfs package.

---
 ansible/roles/zfs/meta/main.yaml   |  3 ++
 ansible/roles/zfs/tasks/linux.yaml | 44 +++++++++++-------------------
 2 files changed, 19 insertions(+), 28 deletions(-)
 create mode 100644 ansible/roles/zfs/meta/main.yaml

diff --git a/ansible/roles/zfs/meta/main.yaml b/ansible/roles/zfs/meta/main.yaml
new file mode 100644
index 0000000..c66040b
--- /dev/null
+++ b/ansible/roles/zfs/meta/main.yaml
@@ -0,0 +1,3 @@
+dependencies:
+  - users
+  - build
diff --git a/ansible/roles/zfs/tasks/linux.yaml b/ansible/roles/zfs/tasks/linux.yaml
index c5e01bb..8abcc4c 100644
--- a/ansible/roles/zfs/tasks/linux.yaml
+++ b/ansible/roles/zfs/tasks/linux.yaml
@@ -1,43 +1,31 @@
-- name: Check trusted gpg keys
-  command: pacman-key -l
-  register: pacmankeys
-  changed_when: false
-  check_mode: no
-  no_log: true
+- name: Install packages
+  package:
+    name:
+      - linux-headers
+    state: present
 
-- name: Trust archzfs signing key
-  command: pacman-key -a -
+- name: Build aur packages
+  register: buildaur
+  become_user: "{{ build_user.name }}"
+  command: "aurutils-sync --no-view {{ item }}"
   args:
-    stdin: "{{ lookup('file', 'archzfs.gpg') }}"
-  when: '"DDF7DB817396A49B2A2723F7403BD972F75D9D76" not in pacmankeys.stdout'
-  register: archzfs_key_imported
-
-- name: Sign archzfs signing key
-  command: pacman-key --lsign-key "DDF7DB817396A49B2A2723F7403BD972F75D9D76"
-  when: archzfs_key_imported.changed
-
-- name: Additional pacman configs
-  register: updatepacman
-  copy:
-    src: "files/{{ item }}"
-    dest: /etc/pacman.d/conf.d/
-    mode: 0644
-    owner: root
-    group: root
+    creates: "/var/cache/pacman/custom/{{ item }}-*.pkg.tar.*"
   loop:
-    - archzfs.conf
+    - zfs-dkms
+    - zfs-utils
 
 - name: Update cache
-  when: updatepacman.changed
+  when: buildaur.changed
   pacman:
     name: []
     state: present
     update_cache: true
-    
+
 - name: Install packages
   package:
     name:
-      - archzfs-linux
+      - zfs-dkms
+      - zfs-utils
     state: present
 
 - name: Enable services