diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-01 15:17:16 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-01 15:17:16 +0100 |
| commit | c5441d30682e0dbe31ebc09bfff6fc0bd0056677 (patch) | |
| tree | 9201c304bbe936b0e40b8526959ba519db52e154 /Makefile | |
| parent | 7675c4ca52b4e34b9e411b6aee3b31fc129e7b50 (diff) | |
| parent | a2f2f15c5ac0e4d37f8c8e3dcbacab696c832404 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 22 |
1 files changed, 21 insertions, 1 deletions
@@ -24,7 +24,27 @@ else ifdef system deploy infest:;@ export get=krebs.$@ export filter=json - make -s eval | sh + script=$$(make -s eval) + echo "$$script" | sh + +.PHONY: deploy2 +ifdef target +deploy2: export target-host = $(target) +else +deploy2: export target-host = $(system) +endif +deploy2:;@ + target=$${target-$$system} + result=$$(nix-instantiate \ + --json \ + --eval \ + krebs/populate.nix \ + --arg source 'with (import ~/stockholm {}).users.$(LOGNAME).$(system).config.krebs.build; assert source-version == 2; source' \ + --argstr target-host "$$target" \ + --argstr target-path /var/src) + script=$$(echo "$$result" | jq -r .) + echo "$$script" | sh + ssh root@$$target nixos-rebuild switch -I /var/src .PHONY: eval eval: |