diff options
| author | jeschli <jeschli@gmail.com> | 2018-04-18 08:19:05 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-04-18 08:19:05 +0200 |
| commit | e800670c1892cca7c9d12476d65bb4750e213890 (patch) | |
| tree | cf20fc27b3fe7e271d7b0441c880283c91f42e60 /lass/1systems/mors | |
| parent | e3445be6dafe4f16e150549baee34055a6b04fef (diff) | |
| parent | 5b8c4d24e274bbf26e85420fc11b5bf7e24ac22d (diff) | |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'lass/1systems/mors')
| -rw-r--r-- | lass/1systems/mors/config.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index f77bc64c2..cd259d0fe 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -140,6 +140,7 @@ with import <stockholm/lib>; dpass dnsutils + generate-secrets ]; #TODO: fix this shit @@ -167,14 +168,8 @@ with import <stockholm/lib>; environment.shellAliases = { deploy = pkgs.writeDash "deploy" '' set -eu - export PATH=${makeBinPath [ - pkgs.bash - pkgs.coreutils - pkgs.nixUnstable - ]} - cd ~/stockholm export SYSTEM="$1" - exec nix-shell -I stockholm="$PWD" --run 'deploy --system="$SYSTEM"' + $(nix-build $HOME/stockholm/lass/kops.nix --no-out-link --argstr name "$SYSTEM" -A deploy) ''; }; |