diff --git a/inventory/group_vars/asgard/vars.yml b/inventory/group_vars/asgard/vars.yml index a7f5074..e30fb3a 100644 --- a/inventory/group_vars/asgard/vars.yml +++ b/inventory/group_vars/asgard/vars.yml @@ -4,7 +4,7 @@ # -------------------------------------------------------------------------------------------------- system_base_additional_tcp_ports: "{{ services_host_services | dict2items | map(attribute='value.tcp', default=[]) | flatten | - union(system_base_tcp_ports) }}" + union(system_base_tcp_ports | default([])) }}" # -------------------------------------------------------------------------------------------------- # system:var diff --git a/playbooks/roles/backups/restic/user/tasks/main.yml b/playbooks/roles/backups/restic/user/tasks/main.yml index ce793b5..18af5c4 100644 --- a/playbooks/roles/backups/restic/user/tasks/main.yml +++ b/playbooks/roles/backups/restic/user/tasks/main.yml @@ -1,17 +1,17 @@ --- -- name: "create restic password file" +- name: "{{ backups_restic_user_name }} : create restic password file" ansible.builtin.template: src: "./restic.password.j2" dest: "{{ backups_restic_user_restic_password_file }}" mode: 0600 -- name: "create aws key file" +- name: "{{ backups_restic_user_name }} : create aws key file" ansible.builtin.template: src: "./restic-aws-keys.yml.j2" dest: "{{ backups_restic_user_aws_keys_file }}" mode: 0600 -- name: "configure service restic backups" +- name: "{{ backups_restic_user_name }} : configure service restic backups" ansible.builtin.template: src: "./volumes.yml.j2" dest: "/etc/restic-batch.d/{{ backups_restic_user_name }}.yml" diff --git a/playbooks/roles/backups/snapshots/user/tasks/main.yml b/playbooks/roles/backups/snapshots/user/tasks/main.yml index c34b603..64eacc0 100644 --- a/playbooks/roles/backups/snapshots/user/tasks/main.yml +++ b/playbooks/roles/backups/snapshots/user/tasks/main.yml @@ -1,5 +1,5 @@ --- -- name: "configure service sanoid snapshots" +- name: "{{ backups_snapshots_user_name }} : configure service sanoid snapshots" ansible.builtin.blockinfile: path: "/etc/sanoid/sanoid.conf" insertbefore: "# BEGIN ANSIBLE MANAGED BLOCK TEMPLATES #" @@ -15,7 +15,7 @@ recursive = yes process_children_only = yes -- name: "configure service syncoid snapshots" +- name: "{{ backups_snapshots_user_name }} : configure service syncoid snapshots" ansible.builtin.template: src: "./volumes.yml.j2" dest: "/etc/syncoid-batch.d/{{ backups_snapshots_user_name }}.yml" diff --git a/playbooks/roles/music/datasets/tasks/main.yml b/playbooks/roles/music/datasets/tasks/main.yml index 9426ce8..699affc 100644 --- a/playbooks/roles/music/datasets/tasks/main.yml +++ b/playbooks/roles/music/datasets/tasks/main.yml @@ -25,3 +25,10 @@ community.general.zfs: name: "{{ music_user_data_dataset }}/flac" state: "present" + +- name: "create backup data dataset" + community.general.zfs: + name: "{{ system_backups_snapshots_data_dataset }}/{{ music_user_name }}" + state: "present" + extra_zfs_properties: + canmount: "off"