aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.build.yml4
-rw-r--r--provision.sh10
2 files changed, 5 insertions, 9 deletions
diff --git a/.build.yml b/.build.yml
index d7e2288..e3106ec 100644
--- a/.build.yml
+++ b/.build.yml
@@ -12,9 +12,11 @@ secrets:
- d587955c-03fb-42ba-9e01-68ca8ed89f99
- 7084b7c7-12be-4509-8927-81ba6eeb1fc0
tasks:
- - setup: |
+ - git-crypt-unlock: |
cd vps/
git crypt unlock
+ cd ../vps-state/
+ git crypt unlock
- tests: |
cd vps/
nix-build -A test
diff --git a/provision.sh b/provision.sh
index 21e0f1f..79358af 100644
--- a/provision.sh
+++ b/provision.sh
@@ -2,17 +2,11 @@
set -Eeuo pipefail
cd "${BASH_SOURCE%/*}/"
-echo "Unlocking git-crypt repositories and loading secrets..."
-git crypt unlock
-pushd ../vps-state/
-git crypt unlock
-popd
-source .envrc
-echo "Done."
-
# shellcheck disable=SC2139
alias ssh="ssh -i secrets/id_rsa root@$TLD"
+source .envrc
+
echo "Shutting down running containers..."
ssh "cd /home/vps/ && docker-compose down"
echo "Done."