From 63116af524b6fb1904bb0534ef99be862da438fe Mon Sep 17 00:00:00 2001
From: michael <michael@balsillie.net>
Date: Sun, 4 Sep 2022 01:47:32 +1200
Subject: [PATCH] notes

---
 ansible/inventory/inventory.yaml         | 11 ++++++-----
 ansible/roles/pikaur/tasks/main.yml      | 18 ++++++++++++++++--
 ansible/roles/zfs-install/tasks/main.yml | 20 +++++++++++++-------
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/ansible/inventory/inventory.yaml b/ansible/inventory/inventory.yaml
index a3dde43..7a0a785 100644
--- a/ansible/inventory/inventory.yaml
+++ b/ansible/inventory/inventory.yaml
@@ -18,9 +18,9 @@ all:
                   ansible_host: node2.balsillie.net
                 node3:
                   ansible_host: node3.balsillie.net
-            hosts:
-              router:
-                ansible_host: router.balsillie.net
+          hosts:
+            router:
+              ansible_host: router.balsillie.net
     workstations:
       children:
         arch:
@@ -30,5 +30,6 @@ all:
             sff:
               ansible_host: sff.balsillie.net
         windows:
-          bridie:
-            ansible_host: bridie.balsillie.net
\ No newline at end of file
+          hosts:
+            bridie:
+              ansible_host: bridie.balsillie.net
\ No newline at end of file
diff --git a/ansible/roles/pikaur/tasks/main.yml b/ansible/roles/pikaur/tasks/main.yml
index 094897f..d3edbae 100644
--- a/ansible/roles/pikaur/tasks/main.yml
+++ b/ansible/roles/pikaur/tasks/main.yml
@@ -14,23 +14,37 @@
     name:
       - base-devel
       - git
+      - pyalpm
+      - python-docutils
+      - python-future
+      - python-commonmark
     state: latest
     update_cache: true
     reason: explicit
 
 - name: clone git repo
+  become: false
   ansible.builtin.git:
     repo: 'https://aur.archlinux.org/pikaur.git'
     dest: /git/pikaur
     depth: 1
     single_branch: yes
 
-- name: make/install pikaur
+- name: make pikaur package
+  become: false
   ansible.builtin.shell:
-    cmd: makepkg -fsri
+    cmd: makepkg
     chdir: /git/pikaur/
+    creates: pikaur-1.11-1-any.pkg.tar.zst
+
+- name: install built pikaur package
+  become: true
+  community.general.pacman:
+    name: /git/pikaur/pikaur-1.11-1-any.pkg.tar.zst
+    state: present
 
 - name: update AUR cache
+  become: true
   community.general.pacman:
     update_cache: yes
     executable: pikaur
diff --git a/ansible/roles/zfs-install/tasks/main.yml b/ansible/roles/zfs-install/tasks/main.yml
index 6f7f9c2..e4aadc9 100644
--- a/ansible/roles/zfs-install/tasks/main.yml
+++ b/ansible/roles/zfs-install/tasks/main.yml
@@ -1,9 +1,15 @@
 ---
 - name: Install ZFS DKMS module
-  community.general.pacman:
-    name: 
-      - zfs-dkms
-    state: latest
-    executable: pikaur
-    update_cache: true
-    reason: explicit
\ No newline at end of file
+  become: true
+  ansible.builtin.shell:
+    cmd: pikaur -S zfs-dkms --noconfirm
+    executable: /usr/bin/bash
+
+# install linux-lts-headers first
+# add a gpg signing key, import and lsign the AUR key below
+# https://gist.github.com/woods/8970150
+# zfs-dkms AUR key 6AD860EED4598027 / 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027
+
+set zfs params (ARC)
+modprobe zfs
+set module to start at boot