Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cac: push* take rsync-target as second arg

Browse Source
This commit is contained in:
tv 2015-06-24 19:10:41 +02:00
parent 1c71216a05
commit bea25b5640
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cac
View File

@ -137,11 +137,11 @@ __cac_cli__pushconfig() {(
SSHPASS=$(echo $server | jq -r .rootpass) SSHPASS=$(echo $server | jq -r .rootpass)
export RSYNC_RSH SSHPASS export RSYNC_RSH SSHPASS
pushgit . $prefix/etc/nixos/ pushgit . $target:$prefix/etc/nixos/
pushgit hosts $prefix/etc/nixos/hosts/ pushgit hosts $target:$prefix/etc/nixos/hosts/
pushgit tmp/nixpkgs/$hostname $prefix/etc/nixos/nixpkgs/ pushgit tmp/nixpkgs/$hostname $target:$prefix/etc/nixos/nixpkgs/
pushdir secrets/$hostname/nix $prefix/etc/nixos/secrets/ pushdir secrets/$hostname/nix $target:$prefix/etc/nixos/secrets/
pushdir secrets/$hostname/rsync $prefix/ pushdir secrets/$hostname/rsync $target:$prefix/
echo "_:{imports=[./modules/$hostname];}" \ echo "_:{imports=[./modules/$hostname];}" \
| $RSYNC_RSH "$target" tee "$prefix/etc/nixos/configuration.nix" \ | $RSYNC_RSH "$target" tee "$prefix/etc/nixos/configuration.nix" \
> /dev/null > /dev/null
@ -264,7 +264,7 @@ _cac_listservers() {(
# rsyncfiles : lines filename |> local-dir x remote-dir -> ? |> ? # rsyncfiles : lines filename |> local-dir x rsync-target -> ? |> ?
rsyncfiles() {( rsyncfiles() {(
set -x set -x
rsync \ rsync \
@ -272,7 +272,7 @@ rsyncfiles() {(
-vzrlptD \ -vzrlptD \
--files-from=- \ --files-from=- \
"$1"/ \ "$1"/ \
"$target:$2" "$2"
)} )}
@ -281,7 +281,7 @@ gitfiles() {
git -C "$1" archive --format=tar HEAD | tar t | sed '/\/$/d' git -C "$1" archive --format=tar HEAD | tar t | sed '/\/$/d'
} }
# pushgit : git-work-tree x remote-dir -> ? # pushgit : git-work-tree x rsync-target -> ?
pushgit() { pushgit() {
gitfiles "$1" | rsyncfiles "$1" "$2" gitfiles "$1" | rsyncfiles "$1" "$2"
} }
@ -292,7 +292,7 @@ dirfiles() {(
find . -type f | sed 's/^\.\///' find . -type f | sed 's/^\.\///'
)} )}
# pushgit : local-dir x remote-dir -> ? # pushdir : local-dir x rsync-target -> ?
pushdir() { pushdir() {
dirfiles "$1" | rsyncfiles "$1" "$2" dirfiles "$1" | rsyncfiles "$1" "$2"
} }