summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-06-14 19:28:57 +0200
committerlassulus <lass@aidsballs.de>2015-06-14 19:28:57 +0200
commitfac851faf9f285310d26a5212ae1bcade615d45b (patch)
tree8b7cd5d2d0a232449c57046bb92846f7e323de6e
parentafa7f0b98d89c9746c204e4ee0dd79e7ae4eb23f (diff)
deploy: take optional target argument
-rwxr-xr-xbin/nixos-deploy7
-rwxr-xr-xdeploy6
2 files changed, 5 insertions, 8 deletions
diff --git a/bin/nixos-deploy b/bin/nixos-deploy
index 6b8418696..d33e9a1d9 100755
--- a/bin/nixos-deploy
+++ b/bin/nixos-deploy
@@ -1,13 +1,12 @@
#! /bin/sh
#
-# deploy
+# usage: nixos-deploy HOST [TARGET] [SYSTEM]
#
set -euf
host=$1
-system=${2-$(nixos-build "$host")}
-
-target=root@$host
+target=${2-root@$host}
+system=${3-$(nixos-build "$host")}
nix-copy-closure --gzip --to "$target" "$system"
diff --git a/deploy b/deploy
index 6034196e1..e99794ed0 100755
--- a/deploy
+++ b/deploy
@@ -1,11 +1,9 @@
#! /bin/sh
#
-# usage: ./deploy HOST
+# usage: ./deploy HOST [TARGET]
#
set -euf
-host=$1
-
export PATH="$PWD/bin:$PATH"
#export nixpkgs=/var/nixpkgs
export nixpkgs_root=$PWD/tmp/nixpkgs
@@ -13,4 +11,4 @@ export config_root=$PWD
export retiolum_hosts=$PWD/hosts
export secrets_root=$PWD/secrets
-exec nixos-deploy "$host"
+exec nixos-deploy "$@"