Add NFS exports file; Improve syntax

server-0.bu

@@ -21,7 +21,7 @@ systemd:
         ExecStartPre=-/bin/podman kill adguardhome
         ExecStartPre=-/bin/podman rm adguardhome
         ExecStartPre=/bin/podman pull adguard/adguardhome
-        ExecStart=docker run \
+        ExecStart=podman run \
           --name adguardhome \
           --restart unless-stopped \
           -v /my/own/workdir:/opt/adguardhome/work \
@@ -37,8 +37,12 @@ systemd:
         [Install]
         WantedBy=multi-user.targetstorage:
 storage:
+  files:
+    - path: /etc/exports
+      contents:
+        inline: /storage-0 192.168.1.*(rw,sync) 
   disks:
-    - device: /dev/nvme0n1
+    - device: /dev/disk/by-id/nvme-WD_Blue_SN570_500GB_22400V806157
       wipe_table: true
       partitions:
         - number: 1
@@ -47,17 +51,25 @@ storage:
           label: swap
   filesystems:
     - path: /var
+      label: var
       device: /dev/disk/by-partlabel/var
       format: btrfs
-      wipe_filesystem: true
-      label: var
+      wipe_filesystem: false
       with_mount_unit: true
-    - device: /dev/disk/by-partlabel/swap
+    - path: /swap
+      label: swap
+      device: /dev/disk/by-partlabel/swap
       format: swap
       wipe_filesystem: true
       with_mount_unit: true
+    - path: /storage-0
+      label: storage-0
+      device: /dev/disk/by-partlabel/storage-0
+      format: btrfs
+      wipe_filesystem: false
+      with_mount_unit: true
   luks:
     - name: static-key
-      device: /dev/nvme0n1
+      device: /dev/disk/by-partlabel/storage-0
       key_file:
         inline: grub.pbkdf2.sha512.10000.8398C220CCB0807EEE0C5C007F475AFD4247506DC186F3F09ACD0D6F8AB9955B4DCB3E4FAC91900E7C507791394D80887C786CF81519F5D44FBB10C901524BEE.3B935E208D0DBEDCDB4634555D1540A3D903A5463197D847B65A54264964739E746CC86FD1A2C809BEA42DE2F68F45445F7FD93B021B3B127FD5CB3EDC30975E

server-0.ign

@@ -1 +1 @@
-{"ignition":{"version":"3.3.0"},"passwd":{"users":[{"name":"core","passwordHash":"$y$j9T$kNtG1zoLVEs5WhA3pE5Eh1$sKckG1SOcZ/p5Vw/4bqSgttLOW5z6WonOtoW6E91mt3","sshAuthorizedKeys":["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDR7q2FfdizNkvel66N/jHcwlEA8R5JEOneKXshMWqkX jeff@station-1"]}]},"storage":{"disks":[{"device":"/dev/nvme0n1","partitions":[{"label":"var","number":1},{"label":"swap","number":2}],"wipeTable":true}],"filesystems":[{"device":"/dev/disk/by-partlabel/var","format":"btrfs","label":"var","path":"/var","wipeFilesystem":true},{"device":"/dev/disk/by-partlabel/swap","format":"swap","wipeFilesystem":true}],"luks":[{"device":"/dev/nvme0n1","keyFile":{"compression":"","source":"data:,grub.pbkdf2.sha512.10000.8398C220CCB0807EEE0C5C007F475AFD4247506DC186F3F09ACD0D6F8AB9955B4DCB3E4FAC91900E7C507791394D80887C786CF81519F5D44FBB10C901524BEE.3B935E208D0DBEDCDB4634555D1540A3D903A5463197D847B65A54264964739E746CC86FD1A2C809BEA42DE2F68F45445F7FD93B021B3B127FD5CB3EDC30975E"},"name":"static-key"}]},"systemd":{"units":[{"contents":"# Generated by Butane\n[Unit]\nRequires=systemd-fsck@dev-disk-by\\x2dpartlabel-var.service\nAfter=systemd-fsck@dev-disk-by\\x2dpartlabel-var.service\n\n[Mount]\nWhere=/var\nWhat=/dev/disk/by-partlabel/var\nType=btrfs\n\n[Install]\nRequiredBy=local-fs.target","enabled":true,"name":"var.mount"},{"contents":"# Generated by Butane\n[Swap]\nWhat=/dev/disk/by-partlabel/swap\n\n[Install]\nRequiredBy=swap.target","enabled":true,"name":"dev-disk-by\\x2dpartlabel-swap.swap"},{"contents":"[Unit]\nDescription=AdGuardHome\nAfter=network-online.target\nWants=network-online.target\n\n[Service]\nTimeoutStartSec=0\nExecStartPre=-/bin/podman kill adguardhome\nExecStartPre=-/bin/podman rm adguardhome\nExecStartPre=/bin/podman pull adguard/adguardhome\nExecStart=docker run \\\n  --name adguardhome \\\n  --restart unless-stopped \\\n  -v /my/own/workdir:/opt/adguardhome/work \\\n  -v /my/own/confdir:/opt/adguardhome/conf \\\n  -p 53:53/tcp -p 53:53/udp \\\n  -p 67:67/udp -p 68:68/udp \\\n  -p 80:80/tcp -p 443:443/tcp -p 443:443/udp -p 3000:3000/tcp \\\n  -p 853:853/tcp \\\n  -p 784:784/udp -p 853:853/udp -p 8853:8853/udp \\\n  -p 5443:5443/tcp -p 5443:5443/udp \\\n  -d adguard/adguardhome\n\n[Install]\nWantedBy=multi-user.targetstorage:\n","enabled":true,"name":"adguardhome.service"}]}}
+{"ignition":{"version":"3.3.0"},"passwd":{"users":[{"name":"core","passwordHash":"$y$j9T$kNtG1zoLVEs5WhA3pE5Eh1$sKckG1SOcZ/p5Vw/4bqSgttLOW5z6WonOtoW6E91mt3","sshAuthorizedKeys":["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDR7q2FfdizNkvel66N/jHcwlEA8R5JEOneKXshMWqkX jeff@station-1"]}]},"storage":{"disks":[{"device":"/dev/disk/by-id/nvme-WD_Blue_SN570_500GB_22400V806157","partitions":[{"label":"var","number":1},{"label":"swap","number":2}],"wipeTable":true}],"files":[{"path":"/etc/exports","contents":{"compression":"","source":"data:,%2Fstorage-0%20192.168.1.*(rw%2Csync)"}}],"filesystems":[{"device":"/dev/disk/by-partlabel/var","format":"btrfs","label":"var","path":"/var","wipeFilesystem":false},{"device":"/dev/disk/by-partlabel/swap","format":"swap","label":"swap","path":"/swap","wipeFilesystem":true},{"device":"/dev/disk/by-partlabel/storage-0","format":"btrfs","label":"storage-0","path":"/storage-0","wipeFilesystem":false}],"luks":[{"device":"/dev/disk/by-partlabel/storage-0","keyFile":{"compression":"","source":"data:,grub.pbkdf2.sha512.10000.8398C220CCB0807EEE0C5C007F475AFD4247506DC186F3F09ACD0D6F8AB9955B4DCB3E4FAC91900E7C507791394D80887C786CF81519F5D44FBB10C901524BEE.3B935E208D0DBEDCDB4634555D1540A3D903A5463197D847B65A54264964739E746CC86FD1A2C809BEA42DE2F68F45445F7FD93B021B3B127FD5CB3EDC30975E"},"name":"static-key"}]},"systemd":{"units":[{"contents":"# Generated by Butane\n[Unit]\nRequires=systemd-fsck@dev-disk-by\\x2dpartlabel-var.service\nAfter=systemd-fsck@dev-disk-by\\x2dpartlabel-var.service\n\n[Mount]\nWhere=/var\nWhat=/dev/disk/by-partlabel/var\nType=btrfs\n\n[Install]\nRequiredBy=local-fs.target","enabled":true,"name":"var.mount"},{"contents":"# Generated by Butane\n[Swap]\nWhat=/dev/disk/by-partlabel/swap\n\n[Install]\nRequiredBy=swap.target","enabled":true,"name":"dev-disk-by\\x2dpartlabel-swap.swap"},{"contents":"# Generated by Butane\n[Unit]\nRequires=systemd-fsck@dev-disk-by\\x2dpartlabel-storage\\x2d0.service\nAfter=systemd-fsck@dev-disk-by\\x2dpartlabel-storage\\x2d0.service\n\n[Mount]\nWhere=/storage-0\nWhat=/dev/disk/by-partlabel/storage-0\nType=btrfs\n\n[Install]\nRequiredBy=local-fs.target","enabled":true,"name":"storage\\x2d0.mount"},{"contents":"[Unit]\nDescription=AdGuardHome\nAfter=network-online.target\nWants=network-online.target\n\n[Service]\nTimeoutStartSec=0\nExecStartPre=-/bin/podman kill adguardhome\nExecStartPre=-/bin/podman rm adguardhome\nExecStartPre=/bin/podman pull adguard/adguardhome\nExecStart=podman run \\\n  --name adguardhome \\\n  --restart unless-stopped \\\n  -v /my/own/workdir:/opt/adguardhome/work \\\n  -v /my/own/confdir:/opt/adguardhome/conf \\\n  -p 53:53/tcp -p 53:53/udp \\\n  -p 67:67/udp -p 68:68/udp \\\n  -p 80:80/tcp -p 443:443/tcp -p 443:443/udp -p 3000:3000/tcp \\\n  -p 853:853/tcp \\\n  -p 784:784/udp -p 853:853/udp -p 8853:8853/udp \\\n  -p 5443:5443/tcp -p 5443:5443/udp \\\n  -d adguard/adguardhome\n\n[Install]\nWantedBy=multi-user.targetstorage:\n","enabled":true,"name":"adguardhome.service"}]}}