deploy,install,populate: admit target SSH port
This commit is contained in:
parent
45bd2ca7a2
commit
411aec6bf9
8
Makefile
8
Makefile
@ -4,6 +4,7 @@ endif
|
|||||||
|
|
||||||
export target_host ?= $(system)
|
export target_host ?= $(system)
|
||||||
export target_user ?= root
|
export target_user ?= root
|
||||||
|
export target_port ?= 22
|
||||||
export target_path ?= /var/src
|
export target_path ?= /var/src
|
||||||
|
|
||||||
evaluate = \
|
evaluate = \
|
||||||
@ -22,7 +23,8 @@ execute = \
|
|||||||
# usage: make deploy system=foo [target_host=bar]
|
# usage: make deploy system=foo [target_host=bar]
|
||||||
deploy:
|
deploy:
|
||||||
$(call execute,populate)
|
$(call execute,populate)
|
||||||
ssh $(target_user)@$(target_host) nixos-rebuild switch -I $(target_path)
|
ssh $(target_user)@$(target_host) -p $(target_port) \
|
||||||
|
nixos-rebuild switch -I $(target_path)
|
||||||
|
|
||||||
# usage: make LOGNAME=shared system=wolf eval.config.krebs.build.host.name
|
# usage: make LOGNAME=shared system=wolf eval.config.krebs.build.host.name
|
||||||
eval eval.:;@$(call evaluate)
|
eval eval.:;@$(call evaluate)
|
||||||
@ -31,10 +33,10 @@ eval.%:;@$(call evaluate,-A $*)
|
|||||||
# usage: make install system=foo [target_host=bar]
|
# usage: make install system=foo [target_host=bar]
|
||||||
install: ssh ?= ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null
|
install: ssh ?= ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null
|
||||||
install:
|
install:
|
||||||
$(ssh) $(target_user)@$(target_host) \
|
$(ssh) $(target_user)@$(target_host) -p $(target_port) \
|
||||||
env target_path=$(target_path) \
|
env target_path=$(target_path) \
|
||||||
sh -s prepare < krebs/4lib/infest/prepare.sh
|
sh -s prepare < krebs/4lib/infest/prepare.sh
|
||||||
target_path=/mnt$(target_path) $(call execute,populate)
|
target_path=/mnt$(target_path) $(call execute,populate)
|
||||||
$(ssh) $(target_user)@$(target_host) \
|
$(ssh) $(target_user)@$(target_host) -p $(target_port) \
|
||||||
env NIXOS_CONFIG=$(target_path)/nixos-config \
|
env NIXOS_CONFIG=$(target_path)/nixos-config \
|
||||||
nixos-install
|
nixos-install
|
||||||
|
@ -51,6 +51,7 @@ let
|
|||||||
source = config.krebs.build.source;
|
source = config.krebs.build.source;
|
||||||
target-user = maybeEnv "target_user" "root";
|
target-user = maybeEnv "target_user" "root";
|
||||||
target-host = maybeEnv "target_host" config.krebs.build.host.name;
|
target-host = maybeEnv "target_host" config.krebs.build.host.name;
|
||||||
|
target-port = maybeEnv "target_port" "22";
|
||||||
target-path = maybeEnv "target_path" "/var/src";
|
target-path = maybeEnv "target_path" "/var/src";
|
||||||
out = ''
|
out = ''
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
@ -62,7 +63,8 @@ let
|
|||||||
}
|
}
|
||||||
|
|
||||||
echo ${shell.escape git-script} \
|
echo ${shell.escape git-script} \
|
||||||
| ssh ${shell.escape "${target-user}@${target-host}"} -T
|
| ssh -p ${shell.escape target-port} \
|
||||||
|
${shell.escape "${target-user}@${target-host}"} -T
|
||||||
|
|
||||||
unset tmpdir
|
unset tmpdir
|
||||||
trap '
|
trap '
|
||||||
@ -93,6 +95,7 @@ let
|
|||||||
(attrNames file-specs)} \
|
(attrNames file-specs)} \
|
||||||
--delete \
|
--delete \
|
||||||
-vFrlptD \
|
-vFrlptD \
|
||||||
|
-e ${shell.escape "ssh -p ${target-port}"} \
|
||||||
${shell.escape target-path}/ \
|
${shell.escape target-path}/ \
|
||||||
${shell.escape "${target-user}@${target-host}:${target-path}"}
|
${shell.escape "${target-user}@${target-host}:${target-path}"}
|
||||||
'';
|
'';
|
||||||
|
Loading…
Reference in New Issue
Block a user