iankelling.org
/
git
/
distro-setup
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3e5e60e
)
minor fixes
author
Ian Kelling
<ian@iankelling.org>
Wed, 24 Apr 2024 00:52:26 +0000
(20:52 -0400)
committer
Ian Kelling
<ian@iankelling.org>
Wed, 24 Apr 2024 00:52:26 +0000
(20:52 -0400)
btrbk-run
patch
|
blob
|
history
diff --git
a/btrbk-run
b/btrbk-run
index 93e8dab79322bbbe8e4bea0fb14419718512e4e7..a28bfac973e592c3750b5078b1fdeaf605edddea 100644
(file)
--- a/
btrbk-run
+++ b/
btrbk-run
@@
-74,7
+74,7
@@
set-location() {
kd|frodo)
at_home=true
;;
kd|frodo)
at_home=true
;;
- x2|x3|sy)
+ x2|x3|sy
|so
)
if [[ $(dig +short @10.2.0.1 -x 10.2.0.2 2>&1 ||:) == kd.b8.nz. ]] \
&& ip n show 10.2.0.1 | grep . &>/dev/null; then
at_home=true
if [[ $(dig +short @10.2.0.1 -x 10.2.0.2 2>&1 ||:) == kd.b8.nz. ]] \
&& ip n show 10.2.0.1 | grep . &>/dev/null; then
at_home=true
@@
-92,7
+92,7
@@
exit-if-no-default-targets() {
mexit 0
fi
case $HOSTNAME in
mexit 0
fi
case $HOSTNAME in
- kw|kd|frodo|x2|x3|sy) : ;;
+ kw|kd|frodo|x2|x3|sy
|so
) : ;;
*)
die "error: no default targets for this host, use -t"
;;
*)
die "error: no default targets for this host, use -t"
;;
@@
-366,6
+366,7
@@
if [[ ! -v targets && ! $source ]]; then
wireless_home_hosts=(
x2
sy
wireless_home_hosts=(
x2
sy
+ so
)
for h in ${wireless_home_hosts[@]}; do
if [[ $HOSTNAME != "$h" ]]; then
)
for h in ${wireless_home_hosts[@]}; do
if [[ $HOSTNAME != "$h" ]]; then
@@
-500,6
+501,7
@@
if $verbose; then
for opt in ${opts_show[@]}; do
if $first; then
printf "%s" "$opt"
for opt in ${opts_show[@]}; do
if $first; then
printf "%s" "$opt"
+ first=false
else
printf " %s" "$opt"
fi
else
printf " %s" "$opt"
fi
@@
-575,13
+577,17
@@
else
sshable=()
sshfail=()
sshable=()
sshfail=()
+ remote_str_cmd="mkdir -p /mnt/root/btrbk /mnt/o/btrbk && \
+date +%z && \
+df --output=size,pcent / | tail -n1"
+
for h in ${targets[@]}; do
if $fast || $conf_only; then
# Use some typical values in this case
root_size=$(( 1024 * 1024 * 2000 )) #2tb
percent_used=10
zone=$(date +%z)
for h in ${targets[@]}; do
if $fast || $conf_only; then
# Use some typical values in this case
root_size=$(( 1024 * 1024 * 2000 )) #2tb
percent_used=10
zone=$(date +%z)
- elif remote_str=$(timeout -s 9 6 ssh root@$h "
mkdir -p /mnt/root/btrbk /mnt/o/btrbk && date +%z && df --output=size,pcent / | tail -n1
"); then
+ elif remote_str=$(timeout -s 9 6 ssh root@$h "
$remote_str_cmd
"); then
mapfile -t tmp_array <<<"$remote_str"
zone="${tmp_array[0]}"
IFS=" " read -r root_size percent_used <<<"${tmp_array[1]}"
mapfile -t tmp_array <<<"$remote_str"
zone="${tmp_array[0]}"
IFS=" " read -r root_size percent_used <<<"${tmp_array[1]}"
@@
-606,6
+612,7
@@
else
min_root_kb=$(( 1024 * 1024 * 200 )) # 200 gb
tmp=$(( root_size < min_root_kb ))
if (( tmp )); then
min_root_kb=$(( 1024 * 1024 * 200 )) # 200 gb
tmp=$(( root_size < min_root_kb ))
if (( tmp )); then
+ e "warning: $h: root_size=$root_zie < 200gb, perhaps it is booted to bootstrap vol. skipping for now"
continue
fi
continue
fi
@@
-643,7
+650,7
@@
else
fi
done
if [[ ! ${sshable[*]} ]] || { $force && [[ ${sshfail[*]} ]]; }; then
fi
done
if [[ ! ${sshable[*]} ]] || { $force && [[ ${sshfail[*]} ]]; }; then
- die "
failed to ssh to
hosts: ${sshfail[*]}"
+ die "
see skipped host warning above or sshfail
hosts: ${sshfail[*]}"
else
if [[ ${sshfail[*]} ]]; then
ret=1
else
if [[ ${sshfail[*]} ]]; then
ret=1
@@
-876,7
+883,8
@@
if [[ $ret == 0 ]]; then
m ssh root@$tg 'btrbk-spread-wrap &>/dev/null </dev/null &'
fi
rsync --mkpath -a -f"- */" -f"+ *" /var/log/btrbk/ root@$tg:/var/log/btrbk/$tg
m ssh root@$tg 'btrbk-spread-wrap &>/dev/null </dev/null &'
fi
rsync --mkpath -a -f"- */" -f"+ *" /var/log/btrbk/ root@$tg:/var/log/btrbk/$tg
- ssh root@$tg /usr/local/bin/mail-backup-clean
+ cmd=/usr/local/bin/mail-backup-clean
+ ssh root@$tg "if test -x $cmd; then $cmd; fi"
done
if [[ $source ]]; then
rsync --mkpath -a -f"- */" -f"+ *" $source:/var/log/btrbk/ /var/log/btrbk/$source
done
if [[ $source ]]; then
rsync --mkpath -a -f"- */" -f"+ *" $source:/var/log/btrbk/ /var/log/btrbk/$source