1 files changed, 13 insertions, 15 deletions
diff --git a/scripts/ci/deploy.sh b/scripts/ci/deploy.sh
index c068e5c..d4eccd0 100755
--- a/scripts/ci/deploy.sh
+++ b/scripts/ci/deploy.sh
@@ -5,7 +5,7 @@ set -Eeuo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 cd ../../
 
-finish_phase() {
+finish-phase() {
   local -r exit_code="${?}"
 
   if [[ "${exit_code}" = 0 ]]; then
@@ -22,7 +22,7 @@ finish_phase() {
   echo "Storing file changes to '.tfstate' files..."
   pushd ../vps-state/
   git add .
-  git commit -m "CI: fallback add all after provision.sh failure for CI run $VPS_COMMIT_SHA" ||:
+  git commit -m "CI: fallback add all after deploy.sh failure for CI run $VPS_COMMIT_SHA" ||:
   git push origin master
   popd
   echo "Done."
@@ -36,9 +36,9 @@ finish_phase() {
 
   echo "Finished cleanup."
 }
-trap finish_phase EXIT
+trap finish-phase EXIT
 
-create_known_hosts_file() {
+create-known-hosts-file() {
   echo "${TLD},$(terraform output public_floating_ip) ssh-rsa $(awk '{print $2}' < ./secrets/ssh/vps-box-server.pub)" > ./generated/generated-known-hosts.txt
 }
 
@@ -52,17 +52,15 @@ envsubst < ./scripts/box/restore-backup.env.sh > ./generated/restore-backup.sh
 echo "Done."
 
 echo "Shutting down running containers and backing up data..."
-create_known_hosts_file
-ssh "$TLD" "cd /home/vps/ && docker-compose down"
-scp ./secrets/borg/borg-remote.pub "$TLD":/root/.ssh/id_rsa.pub
-scp ./secrets/borg/borg-remote     "$TLD":/root/.ssh/id_rsa
-scp ./secrets/borg/known-hosts.txt "$TLD":/root/.ssh/known_hosts
-scp ./generated/create-backup.sh   "$TLD":/home/vps/create-backup.sh
-ssh "$TLD" 'chmod 400 /root/.ssh/id_rsa'
-ssh "$TLD" "chmod +x /home/vps/create-backup.sh"
+create-known-hosts-file
 ssh "$TLD" /home/vps/create-backup.sh > ./logs/borg-create.txt 2>&1
 echo "Done."
 
+echo "Running the Ansible shutdown.yaml playbook..."
+create-known-hosts-file
+ansible-playbook -v shutdown.yaml > ./logs/ansible-shutdown.txt
+echo "Done."
+
 echo "Initializing Terraform..."
 terraform --version
 terraform init
@@ -101,7 +99,7 @@ git push origin master
 popd
 echo "Done."
 
-echo "Running the Ansible playbook..."
-create_known_hosts_file
-ansible-playbook -v provision.yaml > ./logs/ansible.txt
+echo "Running the Ansible provision.yaml playbook..."
+create-known-hosts-file
+ansible-playbook -v provision.yaml > ./logs/ansible-provision.txt
 echo "Done."