diff --git a/group_vars/ruby/vars.yml b/group_vars/ruby/vars.yml deleted file mode 100644 index c6e9bb3..0000000 --- a/group_vars/ruby/vars.yml +++ /dev/null @@ -1,2 +0,0 @@ -t5_uuid: 'b3b60b45-0bd2-42ac-a8d8-35a44fbd2529' -elements_uuid: '5D19-E5D1' diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index c1b9f92..90506d4 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -25,9 +25,6 @@ # General compression tools - bzip2 - - # Working with BTRFS file systems - - btrfs-progs state: present - name: Ensure cron service is enabled diff --git a/roles/lander/files/lander.backup.sh b/roles/lander/files/lander.backup.sh index ec8b3f9..9b9ecb1 100644 --- a/roles/lander/files/lander.backup.sh +++ b/roles/lander/files/lander.backup.sh @@ -6,7 +6,7 @@ snapshot_dir="${data_dir}.snapshot" # Read-only snapshot for atomic backup btrfs subvolume snapshot -r "$data_dir" "$snapshot_dir" || exit $? -/usr/local/bin/restic backup "$snapshot_dir" +restic backup "$snapshot_dir" # Always remove snapshot subvolume, even if restic fails btrfs subvolume delete "$snapshot_dir" diff --git a/roles/restic/tasks/main.yml b/roles/restic/tasks/main.yml index 4c0ae1d..6d2e722 100644 --- a/roles/restic/tasks/main.yml +++ b/roles/restic/tasks/main.yml @@ -53,4 +53,4 @@ name: 'Perform nightly backups' minute: '0' hour: '2' - job: '/usr/bin/bash /etc/backups/backup-all.sh' + job: 'bash /etc/backups/backup-all.sh' diff --git a/roles/restic/templates/backup-all.sh.j2 b/roles/restic/templates/backup-all.sh.j2 index e5de777..5200aaa 100644 --- a/roles/restic/templates/backup-all.sh.j2 +++ b/roles/restic/templates/backup-all.sh.j2 @@ -9,9 +9,9 @@ export RESTIC_REPOSITORY='rest:http://{{ groups['nas'][0] }}:8000/backups' export RESTIC_PASSWORD_FILE='/etc/backups/restic_backups_passwd' for script in $(find /etc/backups -name '*.backup.sh'); do - /usr/bin/bash "$script" + bash "$script" done # Prune older backups -/usr/local/bin/restic forget --keep-last 7 && \ - /usr/local/bin/restic prune +restic forget --keep-last 7 && \ + restic prune diff --git a/roles/ruby/tasks/main.yml b/roles/ruby/tasks/main.yml deleted file mode 100644 index 10a07b7..0000000 --- a/roles/ruby/tasks/main.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- name: Ensure ExFAT tools are present - apt: - name: - - exfat-fuse - - exfatprogs - state: present - -# - name: Ensure mountpoints are present -# file: -# path: "{{ item.path }}" -# state: directory -# mode: '0755' -# owner: debian -# group: debian -# with_items: -# - path: '/mnt/data1' -# - path: '/mnt/data2' - -- name: Ensure T5 BTRFS is mounted - mount: - path: /mnt/data1 - src: "UUID={{ t5_uuid }}" - fstype: btrfs - state: mounted - -- name: Ensure Elements ExFAT is mounted - mount: - path: /mnt/data2 - src: "UUID={{ elements_uuid }}" - fstype: exfat - state: mounted diff --git a/ruby.yml b/ruby.yml deleted file mode 100644 index 0891595..0000000 --- a/ruby.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- name: Perform common tasks - hosts: ruby - become: yes - roles: - - base - - common - tags: base - -- hosts: ruby - become: yes - roles: - - ruby - tags: ruby