From 76db370513f1d235c9a0f00d14edf54f8c60d18f Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Wed, 5 Jun 2019 13:03:59 +1000
Subject: [PATCH] DCD-386: Add backup wrapper and some fixes.

---
 roles/diy_backup/tasks/main.yml                     |  6 ++++++
 .../templates/bitbucket.diy-backup.vars.sh.j2       |  4 +++-
 roles/diy_backup/templates/run-backup.j2            | 13 +++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 roles/diy_backup/templates/run-backup.j2

diff --git a/roles/diy_backup/tasks/main.yml b/roles/diy_backup/tasks/main.yml
index c675375..3f1b1be 100644
--- a/roles/diy_backup/tasks/main.yml
+++ b/roles/diy_backup/tasks/main.yml
@@ -12,3 +12,9 @@
     src: "bitbucket.diy-backup.vars.sh.j2"
     dest: "{{ atl_diy_backup_dir }}/bitbucket.diy-backup.vars.sh"
     mode: 0640
+
+- name: Install backup wrapper script
+  template:
+    src: "run-backup.j2"
+    dest: "{{ atl_installation_base }}/bin/run-backup"
+    mode: 0750
diff --git a/roles/diy_backup/templates/bitbucket.diy-backup.vars.sh.j2 b/roles/diy_backup/templates/bitbucket.diy-backup.vars.sh.j2
index 32b06ff..addfc1e 100644
--- a/roles/diy_backup/templates/bitbucket.diy-backup.vars.sh.j2
+++ b/roles/diy_backup/templates/bitbucket.diy-backup.vars.sh.j2
@@ -1,3 +1,5 @@
+# Created by Ansible
+
 INSTANCE_NAME={{ atl_aws_stack_name }}
 
 AWS_INFO=$(curl -Lsf http://169.254.169.254/latest/dynamic/instance-identity/document)
@@ -9,7 +11,7 @@ AWS_EC2_INSTANCE_ID=$(echo "${AWS_INFO}" | jq -r .instanceId)
 BITBUCKET_VERBOSE_BACKUP=true
 KEEP_BACKUPS=5
 
-{% if atl_ssl_proxy is defined and atl_ssl_proxy %}
+{% if atl_ssl_proxy is defined and atl_ssl_proxy == 'true' %}
 BITBUCKET_URL=https://{{ atl_proxy_name }}
 {% else %}
 BITBUCKET_URL=http://{{ atl_proxy_name }}
diff --git a/roles/diy_backup/templates/run-backup.j2 b/roles/diy_backup/templates/run-backup.j2
new file mode 100644
index 0000000..074b296
--- /dev/null
+++ b/roles/diy_backup/templates/run-backup.j2
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+cd {{ atl_diy_backup_repo }}
+
+if [[ -f .venv/bin/activate ]]; then
+    source .venv/bin/activate
+else
+    virtualenv .venv
+    source .venv/bin/activate
+    pip install boto
+fi
+
+./bitbucket.diy-backup.sh