diff options
| author | makefu <github@syntax-fehler.de> | 2018-04-05 23:21:53 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-04-05 23:21:53 +0200 |
| commit | 54c104e1e1f59906ddf855d6993de14d07a093dc (patch) | |
| tree | cc271ff3806fac4176997a1e51ef03b454e1a6e4 /lass/1systems | |
| parent | 241973f2ec1f4fcf217c37fd102feba82bc0b66e (diff) | |
| parent | 1dd03483619d00d1afc6a278ded0cca6cff2d9ed (diff) | |
Merge remote-tracking branch 'lass/master' into staging
Diffstat (limited to 'lass/1systems')
| -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) ''; }; |