diff options
author | tv <tv@krebsco.de> | 2018-04-10 22:11:17 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2018-04-10 22:11:17 +0200 |
commit | 8d48d325afee416b67721cf64bf1b443fb84fd92 (patch) | |
tree | 9f31ee06d7aa929d8a9e3209dc7225b4e4f18d8f /lass/1systems/mors | |
parent | 68ceb8df1318a87f0b121eda5a2a29eab360d578 (diff) | |
parent | 5b8c4d24e274bbf26e85420fc11b5bf7e24ac22d (diff) |
Merge remote-tracking branch 'prism/master'
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 f77bc64c..cd259d0f 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) ''; }; |