From e1ee5ab2640dd4f1439ab955f5eaa43ac885db71 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 10 Jun 2019 11:24:19 -0300 Subject: Use create_known_hosts_file function instead of duplicating behaviour --- scripts/ci/provision.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'scripts/ci') diff --git a/scripts/ci/provision.sh b/scripts/ci/provision.sh index e204927..8b058e2 100755 --- a/scripts/ci/provision.sh +++ b/scripts/ci/provision.sh @@ -8,6 +8,10 @@ cd ../../ VPS_COMMIT_SHA="$(git rev-parse HEAD)" export VPS_COMMIT_SHA +create_known_hosts_file() { + echo "${TLD},$(terraform output public_floating_ip) ssh-rsa $(awk '{print $2}' < ./secrets/ssh/vps-box-server.pub)" > ./generated-known-hosts.txt +} + setup_borg_files() { local -r template_file="${1}" local -r destination_name="${2}" @@ -22,7 +26,7 @@ setup_borg_files() { } echo "Shutting down running containers and backing up data..." -echo "${TLD},$(terraform output public_floating_ip) ssh-rsa $(awk '{print $2}' < ./secrets/ssh/vps-box-server.pub)" > ./generated-known-hosts.txt +create_known_hosts_file ssh "$TLD" "cd /home/vps/ && docker-compose down" setup_borg_files ./scripts/box/create-backup.env.sh create-backup.sh ssh "$TLD" /home/vps/create-backup.sh @@ -66,8 +70,7 @@ popd echo "Done." echo "Running the Ansible playbook..." - -echo "${TLD},$(terraform output public_floating_ip) ssh-rsa $(awk '{print $2}' < ./secrets/ssh/vps-box-server.pub)" > ./generated-known-hosts.txt +create_known_hosts_file ansible-playbook provision.yaml echo "Done." -- cgit v1.2.3