summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-03-13 21:31:30 +0100
committerlassulus <lassulus@lassul.us>2018-03-13 21:31:30 +0100
commitd5a7a288ba51b6cc21529f610fcfecd90d2664ea (patch)
tree2e05eaa7992f2c2c82ff2c29c5003388fb9770b2
parent666f030b10d8c8ad3ea92fce5c20e013df598cb8 (diff)
l mors.r: minimize deploy script
-rw-r--r--lass/1systems/mors/config.nix24
1 files changed, 2 insertions, 22 deletions
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index cbb71ab24..f77bc64c2 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -170,31 +170,11 @@ with import <stockholm/lib>;
export PATH=${makeBinPath [
pkgs.bash
pkgs.coreutils
- pkgs.nix
- (pkgs.writeDashBin "is-git-crypt-locked" ''
- magic=$(dd status=none if="$1" skip=1 bs=1 count=8)
- test "$magic" = GITCRYPT
- '')
+ pkgs.nixUnstable
]}
cd ~/stockholm
export SYSTEM="$1"
- if is-git-crypt-locked ~/secrets/ready; then
- echo 'secrets are crypted' >&2
- exit 23
- else
- exec nix-shell -I stockholm="$PWD" --run 'deploy --system="$SYSTEM"'
- fi
- '';
- predeploy = pkgs.writeDash "predeploy" ''
- set -eu
- export PATH=${makeBinPath [
- pkgs.bash
- pkgs.coreutils
- pkgs.nix
- ]}
- cd ~/stockholm
- export SYSTEM="$1"
- exec nix-shell -I stockholm="$PWD" --run 'test --system="$SYSTEM" --target="$SYSTEM/var/test/" --force-populate'
+ exec nix-shell -I stockholm="$PWD" --run 'deploy --system="$SYSTEM"'
'';
};