From 3f3acea94c7e706cfe345a92c7f2640e9a0a74fd Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Mon, 10 Jun 2019 11:18:50 -0300
Subject: Don't run restore backup Ansible task when not required

Instead of performing this task on the generated =restore-backup.sh= file, do it
on provision.yaml.

The boolean logic is less confusing and the interpolation is less tricky.
---
 provision.yaml                    | 3 ++-
 scripts/box/restore-backup.env.sh | 7 -------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/provision.yaml b/provision.yaml
index 8a65eec..9137a09 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -36,8 +36,9 @@
         - { src: './secrets/borg/known-hosts.txt',  dest: '/root/.ssh/known_hosts',        mode: '400' }
         - { src: './scripts/box/bash-profile.sh',   dest: '/root/.bash_profile',           mode: '400' }
         - { src: './docker-compose.yaml',           dest: '/home/vps/docker-compose.yaml', mode: '400' }
-    - name: Restore borg backup into fresh volume
+    - name: Restore borg backup when we have a fresh volume
       shell: /home/vps/restore-backup.sh
+      when: lookup('env', 'DESTROY_VOLUME') == "1"
     - name: Start docker-compose
       docker_service:
         project_src: /home/vps/
diff --git a/scripts/box/restore-backup.env.sh b/scripts/box/restore-backup.env.sh
index 99b807c..151ded5 100755
--- a/scripts/box/restore-backup.env.sh
+++ b/scripts/box/restore-backup.env.sh
@@ -1,13 +1,6 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-# Check for ${DOLLAR}{DESTROY_VOLUME} interpolated value
-[[ "${DESTROY_VOLUME}" != "" ]] || {
-  echo "Volume is not fresh."
-  echo "Skipping restoring from backup."
-  exit 0
-}
-
 export BORG_REMOTE_PATH="${BORG_REMOTE_PATH}"
 export BORG_PASSPHRASE="${BORG_PASSPHRASE}"
 
-- 
cgit v1.2.3