From 74b97cd19dcedd27cbd3fe41fc89feb1d2cd3518 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 28 May 2019 02:04:45 -0300 Subject: Remove git rev-parse from .envrc --- default.nix | 2 +- provision.sh | 2 +- secrets/envrc.sh | Bin 1568 -> 1493 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index c6d6179..68604f9 100644 --- a/default.nix +++ b/default.nix @@ -14,7 +14,7 @@ let name = "vps-task"; src = rootSrc; phases = "unpackPhase buildPhase"; - buildInputs = [ pkgs.gitMinimal ]; + buildInputs = [ ]; buildPhase = '' echo "ERROR: base task buildPhase not overriden." exit 1 diff --git a/provision.sh b/provision.sh index e5f6baf..a4b077b 100755 --- a/provision.sh +++ b/provision.sh @@ -8,7 +8,7 @@ echo "Shutting down running containers and backing up data..." ssh "$TLD" "cd /home/vps/ && docker-compose down" scp ./secrets/borg_remote.pub "$TLD":/root/.ssh/id_rsa.pub scp ./secrets/borg_remote "$TLD":/root/.ssh/id_rsa -envsubst < run-backup-template.sh | ssh "$TLD" 'cat > /home/vps/run-backup.sh && chmod +x /home/vps/run-backup.sh' +VPS_COMMIT_SHA="$(git rev-parse HEAD)" envsubst < run-backup-template.sh | ssh "$TLD" 'cat > /home/vps/run-backup.sh && chmod +x /home/vps/run-backup.sh' ssh "$TLD" /home/vps/run-backup.sh echo "Done." diff --git a/secrets/envrc.sh b/secrets/envrc.sh index fac935d..52e5ac1 100644 Binary files a/secrets/envrc.sh and b/secrets/envrc.sh differ -- cgit v1.2.3