Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "l krops: get target as argument"

Browse Source 
This reverts commit 39870dbc4a.
This commit is contained in:
lassulus 2018-09-07 17:35:41 +02:00
parent f8a594cff8
commit 293dada1cd
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lass/1systems/blue/config.nix
View File

@ -16,7 +16,7 @@ with import <stockholm/lib>;
deploy = pkgs.writeDash "deploy" '' deploy = pkgs.writeDash "deploy" ''
set -eu set -eu
export SYSTEM="$1" export SYSTEM="$1"
$(nix-build $HOME/stockholm/lass/krops.nix --no-out-link --argstr name "$SYSTEM" --argstr target "root@$SYSTEM/var/src" -A deploy) $(nix-build $HOME/stockholm/lass/krops.nix --no-out-link --argstr name "$SYSTEM" -A deploy)
''; '';
}; };

15
lass/krops.nix
View File

@ -1,4 +1,4 @@
{ config ? config, name, target}: let { config ? config, name }: let
inherit (import ../krebs/krops.nix { inherit name; }) inherit (import ../krebs/krops.nix { inherit name; })
krebs-source krebs-source
lib lib
@ -24,12 +24,19 @@ in {
# usage: $(nix-build --no-out-link --argstr name HOSTNAME -A deploy) # usage: $(nix-build --no-out-link --argstr name HOSTNAME -A deploy)
deploy = pkgs.krops.writeDeploy "${name}-deploy" { deploy = pkgs.krops.writeDeploy "${name}-deploy" {
source = source { test = false; }; source = source { test = false; };
inherit target; target = "root@${name}/var/src";
}; };
# usage: $(nix-build --no-out-link --argstr name HOSTNAME -A test) # usage: $(nix-build --no-out-link --argstr name HOSTNAME -A test)
ci = pkgs.krops.writeTest "${name}-test" { test = pkgs.krops.writeTest "${name}-test" {
source = source { test = true; }; source = source { test = true; };
inherit target; target = "${lib.getEnv "HOME"}/tmp/${name}-krops-test-src";
}; };
ci = map (host:
pkgs.krops.writeTest "${host.name}-test" {
source = source { test = true; };
target = "${lib.getEnv "TMPDIR"}/lass/${host.name}";
}
) (lib.filter (host: lib.getAttr "ci" host && host.owner == "lass") (lib.attrValues config.krebs.hosts));
} }