deploy: take target as optional argument

3 files changed, 20 insertions, 17 deletions

diff --git a/bin/copy-secrets b/bin/copy-secrets
index 36854eaf1..5ef94b09c 100755
--- a/bin/copy-secrets
+++ b/bin/copy-secrets
@@ -1,23 +1,25 @@
 #! /bin/sh
+#
+# copy-secrets system_name target
+#
 set -euf
 
-host=$1
+system_name=$1
+target=$2
 
-target=root@$host
-
-nixos_config=$config_root/modules/$host
-secrets_nix=$secrets_root/$host/nix
-secrets_rsync=$secrets_root/$host/rsync
+nixos_config=$config_root/modules/$system_name
+secrets_nix=$secrets_root/$system_name/nix
+secrets_rsync=$secrets_root/$system_name/rsync
 
 if ! test -e "$secrets_rsync"; then
   exit # nothing to do
 fi
 
-retiolum_secret=$(nixos-query $host services.retiolum.privateKeyFile)
-retiolum_uid=$(nixos-query $host users.extraUsers.retiolum-tinc.uid)
+retiolum_secret=$(nixos-query $system_name services.retiolum.privateKeyFile)
+retiolum_uid=$(nixos-query $system_name users.extraUsers.retiolum-tinc.uid)
 
 ejabberd_secret=/etc/ejabberd/ejabberd.pem
-ejabberd_uid=$(nixos-query $host users.extraUsers.ejabberd.uid)
+ejabberd_uid=$(nixos-query $system_name users.extraUsers.ejabberd.uid)
 
 rsync -cz --chown=0:0 -vr "$secrets_rsync/" "$target:/"
 
diff --git a/bin/nixos-deploy b/bin/nixos-deploy
index 6b8418696..fa86a8c88 100755
--- a/bin/nixos-deploy
+++ b/bin/nixos-deploy
@@ -1,16 +1,16 @@
 #! /bin/sh
 #
-# deploy
+# nixos-deploy system_name target
 #
 set -euf
 
-host=$1
-system=${2-$(nixos-build "$host")}
+system_name=$1
+target=$2
 
-target=root@$host
+system=$(nixos-build "$system_name")
 
 nix-copy-closure --gzip --to "$target" "$system"
 
-copy-secrets "$host"
+copy-secrets "$system_name" "$target"
 
 ssh ${NIX_SSHOPTS-} "$target" "$system/bin/switch-to-configuration" switch
diff --git a/deploy b/deploy
index 6034196e1..c32ba9c30 100755
--- a/deploy
+++ b/deploy
@@ -1,10 +1,11 @@
 #! /bin/sh
 #
-# usage: ./deploy HOST
+# usage: ./deploy system_name [target]
 #
 set -euf
 
-host=$1
+system_name=$1
+target=${2-root@$system_name}
 
 export PATH="$PWD/bin:$PATH"
 #export nixpkgs=/var/nixpkgs
@@ -13,4 +14,4 @@ export config_root=$PWD
 export retiolum_hosts=$PWD/hosts
 export secrets_root=$PWD/secrets
 
-exec nixos-deploy "$host"
+exec nixos-deploy "$system_name" "$target"