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

krebs.backup: don't create plan.dst.path implicitly

Browse Source
This commit is contained in:
tv 2016-04-17 06:00:48 +02:00
parent 70c27e21b1
commit 377b0dff1c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
krebs/3modules/backup.nix
View File

@ -129,6 +129,7 @@ let
rsync "$@" rsync "$@"
} }
remote_rsync=${shell.escape (concatStringsSep " && " [ remote_rsync=${shell.escape (concatStringsSep " && " [
"stat ${shell.escape plan.dst.path} >/dev/null"
"mkdir -m 0700 -p ${shell.escape plan.dst.path}/current" "mkdir -m 0700 -p ${shell.escape plan.dst.path}/current"
"exec flock -n ${shell.escape plan.dst.path} rsync" "exec flock -n ${shell.escape plan.dst.path} rsync"
])} ])}
@ -148,6 +149,7 @@ let
} }
rsh="ssh -F /dev/null -i $identity -p $src_port" rsh="ssh -F /dev/null -i $identity -p $src_port"
local_rsync() { local_rsync() {
stat ${shell.escape plan.dst.path} >/dev/null
mkdir -m 0700 -p ${shell.escape plan.dst.path}/current mkdir -m 0700 -p ${shell.escape plan.dst.path}/current
flock -n ${shell.escape plan.dst.path} rsync "$@" flock -n ${shell.escape plan.dst.path} rsync "$@"
} }
@ -230,7 +232,6 @@ in out
# TODO don't cancel plans on activation # TODO don't cancel plans on activation
# also, don't hang while deploying at: # also, don't hang while deploying at:
# starting the following units: backup.wu-home-xu.push.service, backup.wu-home-xu.push.timer # starting the following units: backup.wu-home-xu.push.service, backup.wu-home-xu.push.timer
# TODO make sure /bku is properly mounted
# TODO make sure that secure hosts cannot backup to insecure ones # TODO make sure that secure hosts cannot backup to insecure ones
# TODO optionally only backup when src and dst are near enough :) # TODO optionally only backup when src and dst are near enough :)
# TODO try using btrfs for snapshots (configurable) # TODO try using btrfs for snapshots (configurable)