summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-02-16 08:24:08 +0100
committertv <tv@krebsco.de>2016-02-16 08:24:08 +0100
commite8ccf0e4da1320dda3b7baca8f585f633726c755 (patch)
tree358e2c18e573e7f53a7217e35a6bd21a33eb5647
parent18ac722ee6d85ba0d01f8cd3d04bca5b59843af8 (diff)
make {deploy,test}: make ssh configurable
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7126332da..8d1498d59 100644
--- a/Makefile
+++ b/Makefile
@@ -54,9 +54,10 @@ execute = \
echo "$$script" | sh
# usage: make deploy system=foo [target_host=bar]
+deploy: ssh ?= ssh
deploy:
$(call execute,populate)
- ssh $(target_user)@$(target_host) -p $(target_port) \
+ $(ssh) $(target_user)@$(target_host) -p $(target_port) \
nixos-rebuild switch --show-trace -I $(target_path)
# usage: make LOGNAME=shared system=wolf eval.config.krebs.build.host.name
@@ -75,8 +76,9 @@ install:
nixos-install
# usage: make test system=foo [target=bar]
+test: ssh ?= ssh
test:
$(call execute,populate)
- ssh $(target_user)@$(target_host) -p $(target_port) \
+ $(ssh) $(target_user)@$(target_host) -p $(target_port) \
nix-build --no-out-link --show-trace -I $(target_path) \
-A config.system.build.toplevel $(target_path)/stockholm