handle data mode alpine installs

hosts.yml

@@ -17,7 +17,7 @@ all:
       ansible_port: 22
       ansible_python_interpreter: /usr/bin/python3
       ansible_become_method: doas
-      use_lbu: true
+      alpine_mode: diskless
       alpine_version: v3.16
       alpine_repos:
         - main
@@ -28,41 +28,12 @@ all:
       ansible_port: 22
       ansible_python_interpreter: /usr/bin/python3
       ansible_become_method: doas
-      use_lbu: true
+      alpine_mode: data
       alpine_version: v3.16
       alpine_repos:
         - main
         - community
-      mounts:
-        - path: "/media/mmcblk0p1"
-          src: "0EB4-4BBF"
-          fstype: "vfat"
-          opts: "noauto,defaults"
-          passno: "0"
-        - path: "/boot"
-          src: "/media/mmcblk0p1/boot"
-          fstype: "none"
-          opts: "defaults,bind"
-          passno: "0"
-        - path: "/media/mmcblk0p2"
-          src: "UUID=75d4943d-2a1a-4f76-9f60-cff99b4d2e1f"
-          fstype: "ext4"
-          opts: "defaults"
-          passno: "0"
-        - path: "/var/lib/builder/src"
-          src: "/media/mmcblk0p2/src"
-          fstype: "none"
-          opts: "bind"
-          passno: "0"
-        - path: "/mnt/btr_pool"
-          src: "/dev/mapper/disk0"
-          fstype: "btrfs"
-          opts: "subvolid=5,noatime"
-          passno: "0"
 
-      rpi_cfg:
-        - "enable_uart=1"
-        - "otg_mode=1"
       dmcrypt_targets:
         - name: "WDC WDS400T1R0A"
           target: "disk0"
@@ -75,13 +46,61 @@ all:
           key: "/luks_key.asc:gpg"
           remdev: "/dev/mmcblk0p2"
 
+      mounts:
+
+        - src: "/dev/mmcblk0p1"
+          path: "/media/mmcblk0p1"
+          fstype: "vfat"
+          opts: "noauto,defaults"
+          passno: "0"
+
+        - src: "/media/mmcblk0p1/boot"
+          path: "/boot"
+          fstype: "none"
+          opts: "defaults,bind"
+          passno: "0"
+
+        - src: "/dev/mmcblk0p2"
+          path: "/media/mmcblk0p2"
+          fstype: "ext4"
+          opts: "defaults"
+          passno: "0"
+
+        - src: "/dev/mapper/disk0"
+          path: "/mnt/btr_pool"
+          fstype: "btrfs"
+          opts: "subvolid=5,noatime"
+          passno: "0"
+
+        - src: "/dev/mapper/disk0"
+          path: "/var/log"
+          fstype: "btrfs"
+          opts: "subvol=logs,noatime"
+          passno: "0"
+
+        - src: "/dev/mapper/disk0"
+          path: "/home"
+          fstype: "btrfs"
+          opts: "subvol=home,noatime"
+          passno: "0"
+
+        - src: "/dev/mapper/disk0"
+          path: "/var/lib/builder/src"
+          fstype: "btrfs"
+          opts: "subvol=src,noatime"
+          passno: "0"
+
+      rpi_cfg:
+        - "enable_uart=1"
+        - "otg_mode=1"
+
     caladan:
       ansible_host: caladan
       ansible_user: ansible
       ansible_port: 22
       ansible_python_interpreter: /usr/bin/python3
       ansible_become_method: doas
-      use_lbu: false
+      alpine_mode: system
       alpine_version: v3.16
       alpine_repos:
         - main

roles/cryptoraid/tasks/alpine.yml

@@ -41,7 +41,7 @@
 - name: add btrfs-scan init script to lbu
   lbu:
     include: /etc/init.d/btrfs-scan
-  when: use_lbu
+  when: alpine_mode in ["diskless", "data"]
 
 - name: enable btrfs-scan at boot
   service:

roles/lbu_commit/tasks/main.yml

@@ -2,4 +2,4 @@
 - name: lbu commit
   lbu:
     commit: true
-  when: ansible_distribution == "Alpine" and use_lbu
+  when: ansible_distribution == "Alpine" and alpine_mode in ["diskless", "data"]

roles/pi_fan_hwpwm/tasks/alpine.yml

@@ -49,7 +49,7 @@
     include:
       - /usr/local/sbin/pi_fan_hwpwm
       - /etc/init.d/pi_fan_hwpwm
-  when: ansible_distribution == "Alpine" and use_lbu
+  when: ansible_distribution == "Alpine" and alpine_mode in ["diskless", "data"]
 
 - name: add iomem=relaxed to cmdline.txt
   replace:

roles/quality_of_life/tasks/main.yml

@@ -94,4 +94,4 @@
     exclude:
       - /home/rilla/.local/share/nvim
       - /home/rilla/.cache
-  when: ansible_distribution == "Alpine" and use_lbu
+  when: ansible_distribution == "Alpine" and alpine_mode == "diskless"

roles/users/tasks/ansible.yml

@@ -30,4 +30,4 @@
     exclude:
       - /var/lib/ansible/.ansible
       - /var/lib/ansible/.ash_history
-  when: ansible_distribution == "Alpine" and use_lbu
+  when: ansible_distribution == "Alpine" and alpine_mode in ["diskless", "data"]

roles/users/tasks/builder.yml

@@ -34,4 +34,4 @@
     exclude:
       - /var/lib/builder/.ash_history
       - /var/lib/builder/src
-  when: ansible_distribution == "Alpine" and use_lbu
+  when: ansible_distribution == "Alpine" and alpine_mode in ["diskless", "data"]

roles/users/tasks/gopass.yml

@@ -26,4 +26,4 @@
       - /var/lib/gopass
     exclude:
       - /var/lib/gopass/.ash_history
-  when: ansible_distribution == "Alpine" and use_lbu
+  when: ansible_distribution == "Alpine" and alpine_mode in ["diskless", "data"]

roles/users/tasks/rilla.yml

@@ -38,4 +38,4 @@
       - /home/rilla
     exclude:
       - /home/rilla/.ash_history
-  when: ansible_distribution == "Alpine" and use_lbu
+  when: ansible_distribution == "Alpine" and alpine_mode == "diskless"

roles/users/tasks/woodpecker.yml

@@ -38,4 +38,4 @@
       - /var/lib/woodpecker
     exclude:
       - /var/lib/woodpecker/.ash_history
-  when: ansible_distribution == "Alpine" and use_lbu
+  when: ansible_distribution == "Alpine" and alpine_mode in ["diskless", "data"]