diff --git a/ansible/environments/colo/host_vars/mrmanager b/ansible/environments/colo/host_vars/mrmanager index 323108e..46f484f 100644 --- a/ansible/environments/colo/host_vars/mrmanager +++ b/ansible/environments/colo/host_vars/mrmanager @@ -1,8 +1,10 @@ os_flavor: "freebsd" zfs_snapshot_datasets: - - zroot/freebsd/main/be - - zdata/vm - - zdata/k8spersistent + - path: zroot/freebsd/main/be + - path: zdata/vm + - path: zdata/vm/poudriere/disk0 + include: false + - path: zdata/k8spersistent sshd_enabled: true loader_conf: "mrmanager_loader.conf" rc_conf: "mrmanager_rc.conf" diff --git a/ansible/environments/home/host_vars/homeserver b/ansible/environments/home/host_vars/homeserver index f4e84d0..d128f65 100644 --- a/ansible/environments/home/host_vars/homeserver +++ b/ansible/environments/home/host_vars/homeserver @@ -1,6 +1,6 @@ os_flavor: "freebsd" zfs_snapshot_datasets: - - zroot/freebsd/computer/be/default + - path: zroot/freebsd/computer/be/default sshd_enabled: true sshd_conf: "sshd_config" pf_config: "homeserver_pf.conf" diff --git a/ansible/environments/laptop/host_vars/odofreebsd b/ansible/environments/laptop/host_vars/odofreebsd index c3831fe..1202fe3 100644 --- a/ansible/environments/laptop/host_vars/odofreebsd +++ b/ansible/environments/laptop/host_vars/odofreebsd @@ -1,7 +1,7 @@ os_flavor: "freebsd" custom_repo: 13amd64-default-framework zfs_snapshot_datasets: - - zroot/freebsd/release/be/default + - path: zroot/freebsd/release/be/default sshd_enabled: true sshd_conf: "sshd_config" pf_config: "odofreebsd_pf.conf" diff --git a/ansible/environments/laptop/host_vars/odolinux b/ansible/environments/laptop/host_vars/odolinux index e831aff..86b99e8 100644 --- a/ansible/environments/laptop/host_vars/odolinux +++ b/ansible/environments/laptop/host_vars/odolinux @@ -18,8 +18,8 @@ users: gitconfig: "gitconfig_home" zfs_snapshot_datasets: # - zroot/linux/archmain/home - - zroot/linux/archmain/be - - zroot/data/bridge/family_disks + - path: zroot/linux/archmain/be + - path: zroot/data/bridge/family_disks install_graphics: true graphics_driver: "intel" build_user: diff --git a/ansible/roles/zrepl/templates/zrepl.yml.j2 b/ansible/roles/zrepl/templates/zrepl.yml.j2 index e05dc2c..017a5c2 100644 --- a/ansible/roles/zrepl/templates/zrepl.yml.j2 +++ b/ansible/roles/zrepl/templates/zrepl.yml.j2 @@ -5,7 +5,7 @@ jobs: type: snap filesystems: { {% for dataset in zfs_snapshot_datasets %} - "{{dataset}}<": true, + "{{dataset.path}}<": {{dataset.include | default(true) | lower}}, {% endfor %} } # create snapshots with prefix `zrepl_` every 15 minutes