From c42c3cbd451526438c8d63eb44a0216a104e87de Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Mon, 1 Aug 2022 13:24:39 +0100
Subject: [PATCH] adding additional variables

---
 ansible/homelab/playbooks/setup-home-lab.yml       | 2 +-
 ansible/homelab/tasks/checkout-git-repos-tasks.yml | 4 ++--
 ansible/homelab/tasks/restore-volume-tasks.yml     | 8 ++++----
 ansible/homelab/variables.yml                      | 4 +++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ansible/homelab/playbooks/setup-home-lab.yml b/ansible/homelab/playbooks/setup-home-lab.yml
index 5ae1340..9476411 100644
--- a/ansible/homelab/playbooks/setup-home-lab.yml
+++ b/ansible/homelab/playbooks/setup-home-lab.yml
@@ -30,4 +30,4 @@
 
   - name: Start Portainer
     tags: "skip-e2e" # we can't mount volumes on test runners.
-    command: chdir=/home/cianhatton/checkouts/HomeLab/docker-compose/portainer docker compose up -d
+    command: "chdir={{home_lab_checkout_dir}}/docker-compose/portainer docker compose up -d"
diff --git a/ansible/homelab/tasks/checkout-git-repos-tasks.yml b/ansible/homelab/tasks/checkout-git-repos-tasks.yml
index a104329..099a7ae 100644
--- a/ansible/homelab/tasks/checkout-git-repos-tasks.yml
+++ b/ansible/homelab/tasks/checkout-git-repos-tasks.yml
@@ -2,12 +2,12 @@
 - name: Git checkout HomeLab repository
   ansible.builtin.git:
     repo: 'https://github.com/chatton/HomeLab.git'
-    dest: "/home/{{homelab_user}}/checkouts/HomeLab"
+    dest: "{{home_lab_checkout_dir}}"
     force: true
     version: master
 
 - name: Change Ownership
   file:
-    path: "/home/{{homelab_user}}/checkouts/HomeLab"
+    path: "{{home_lab_checkout_dir}}"
     owner: "{{homelab_user}}"
     group: "{{homelab_group}}"
\ No newline at end of file
diff --git a/ansible/homelab/tasks/restore-volume-tasks.yml b/ansible/homelab/tasks/restore-volume-tasks.yml
index 9e2700f..20bd136 100644
--- a/ansible/homelab/tasks/restore-volume-tasks.yml
+++ b/ansible/homelab/tasks/restore-volume-tasks.yml
@@ -8,10 +8,10 @@
 - name: Find volumes
   ansible.builtin.shell: docker run --rm
     -v /var/run/docker.sock:/var/run/docker.sock
-    -v /mnt/hdds/backups/:/mnt/hdds/backups/
-    ghcr.io/chatton/docker-volume-backup:master
+    -v "{{backup_dir}}:{{backup_dir}}"
+    "{{docker_volume_backup_image}}"
     list-backups
-    --host-path /mnt/hdds/backups/
+    --host-path "{{backup_dir}}"
     --volume-name-filter {{container_name}}
     --newest-only
   register: out
@@ -25,7 +25,7 @@
 - name: Restore Volume
   ansible.builtin.command: docker run --rm
     -v /var/run/docker.sock:/var/run/docker.sock
-    ghcr.io/chatton/docker-volume-backup:master
+    {{docker_volume_backup_image}}
     restore-volume
     --volume {{item.volumeName}}
     --archive {{item.absoluteFilePath}}
diff --git a/ansible/homelab/variables.yml b/ansible/homelab/variables.yml
index fcd149c..2b082ab 100644
--- a/ansible/homelab/variables.yml
+++ b/ansible/homelab/variables.yml
@@ -1,4 +1,6 @@
 ---
 homelab_user: cianhatton
 homelab_group: cianhatton
-backup_dir: /mnt/hdds/backups/
\ No newline at end of file
+backup_dir: /mnt/hdds/backups/
+docker_volume_backup_image: ghcr.io/chatton/docker-volume-backup:master
+home_lab_checkout_dir: /home/cianhatton/checkouts/HomeLab