summaryrefslogtreecommitdiffstats
path: root/run
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-03-19 22:48:22 +0100
committertv <tv@shackspace.de>2015-05-19 23:10:57 +0200
commit61fc66a2d2047dce1012d7d31c35ce096963d43c (patch)
treee0c4af16284311832e4a638c1ef4fa0212879d0c /run
parent6495611cd4977ac89388053ffb4c31cf4794959e (diff)
run: extract rsync_filter from deploy
Diffstat (limited to 'run')
-rwxr-xr-xrun14
1 files changed, 11 insertions, 3 deletions
diff --git a/run b/run
index 0883eccef..62d72d1ac 100755
--- a/run
+++ b/run
@@ -17,6 +17,16 @@ deploy() {(
main=$1
target=$2
+ rsync_filter "$main" \
+ | rsync -f '. -' -zvrlptD --delete-excluded ./ "$target":/etc/nixos/
+
+ ssh "$target" nixos-rebuild switch -I nixos-config=/etc/nixos/"$main"
+)}
+
+# rsync_filter : nix-file -> rsync-filter
+rsync_filter() {(
+ main=$1
+
hosts=$(list_hosts)
module_imports=$(set -euf; list_module_imports "$main")
other_imports=$(
@@ -43,9 +53,7 @@ deploy() {(
rel_deps=$(echo "$abs_deps" | make_relative_to "$PWD")
filter=$(echo "$rel_deps" | make_rsync_whitelist)
- echo "$filter" \
- | rsync -f '. -' -zvrlptD --delete-excluded ./ "$target":/etc/nixos/
- ssh "$target" nixos-rebuild switch -I nixos-config=/etc/nixos/"$main"
+ echo "$filter"
)}
# list_module_imports : nix-file -> lines nix-file