diff options
| author | jeschli <jeschli@gmail.com> | 2018-03-22 11:42:05 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-03-22 11:42:05 +0100 |
| commit | 9bb628406d001fbf9070bf533f1b81f43f4c96a8 (patch) | |
| tree | a0b95f82f3c3a0b52ebc87f6c7756de70d646bfb /lass/1systems/mors | |
| parent | 87528e2ab6085a1a0fadcd1aa00870834c878c27 (diff) | |
| parent | bd4def24bfbd8f034032e3a6e89ce4dd88d6930e (diff) | |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'lass/1systems/mors')
| -rw-r--r-- | lass/1systems/mors/config.nix | 24 |
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"' ''; }; |