#!/bin/bash
-set -x
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+
+source /usr/local/lib/err
usage() {
cat <<EOF
Usage: ${0##*/} OLD_HOST NEW_HOST
-Adjust home network dns so NEW_HOST resolves locally if it is on the
-local network. Turn off mail receiving on OLD_HOST, run btrbk to move
-mail to NEW_HOST, turn on mail receiving on NEW_HOST.
+Turn off mail receiving on OLD_HOST, run btrbk to move mail to NEW_HOST,
+turn on mail receiving on NEW_HOST. Assumes we want to move all
+filesystems unless passing -o.
-o Only btrbk /o, instead of all filesystems.
--w Don't try to ssh to wrt. Should only be used in unusual network situation.
-h|--help Print help and exit.
+I used to adjust home network dns so NEW_HOST resolves locally if it is
+on the local network, but its simpler just not to and just rely
+on the internet. Email can wait.
+
Note: Uses GNU getopt options parsing style
EOF
exit $1
}
+restore_new_btrbk=false
+restore_old_btrbk=false
+cleanup() {
+ if $restore_new_btrbk; then
+ m $new_shell sudo systemctl start btrbk.timer
+ fi
+ if $restore_old_btrbk; then
+ m $old_shell sudo systemctl start btrbk.timer
+ fi
+}
+_errcatch_cleanup=cleanup # used by sourced err
+
+pre="${0##*/}:"
+m() { printf "$pre %s\n" "$*"; "$@"; }
+e() { printf "$pre %s\n" "$*"; }
+
##### begin command line parsing ########
-update_wrt=true # default
temp=$(getopt -l help owh "$@") || usage 1
-mp_args=
+mp_args="-m /o,/q,/a"
eval set -- "$temp"
while true; do
case $1 in
-o) mp_args="-m /o"; shift ;;
- -w) update_wrt=false; shift ;;
-h|--help) usage ;;
--) shift; break ;;
*) echo "$0: Internal error! unexpected args: $*" ; exit 1 ;;
new_host=$2
source /a/bin/bash_unpublished/source-state
-if [[ $old_host != $MAIL_HOST ]]; then
- read -p "warning: \$old_host != \$MAIL_HOST: $old_host != $MAIL_HOST, proceed? y/N "
+if [[ $old_host != "$MAIL_HOST" ]]; then
+ read -r -p "warning: \$old_host != \$MAIL_HOST: $old_host != $MAIL_HOST, proceed? y/N "
if [[ $REPLY != [yY] ]]; then
exit 1
fi
exit 1
fi
-at_home=false
-if timeout -s 9 5 ssh-keyscan -p 2220 -t rsa 10.0.0.1 2>/dev/null | grep -qFx '[10.0.0.1]:2220 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCH+/h1dGEfKEusBblndU2e6QT4wLCm5+yqr/sqh/0X9YfjR7BfWWm8nNmuP55cYc+Wuf5ljB1H1acXEcsl1y8e0j3agHfF0V74FE1N1zz5nn2Ep8NHnmqgEhza38ZxMPh+4p3X7zklEKU7+3SzybKBi8sg0wLzlS2LM0JaUN80zR2sK11Kye3dURUXPk78u5wodOkgcEYRwSYaDMJlUzWP+poRXIDJwFaMQnwmxbl/c84yOyaU0x/d6hFwoRscWecihX+vvBNeSyxR4xr2HDOyUWwJkctyAgt2p7w3tfkXOKcCRzTAjGVIMQLTvo0sG/yJbcyHoEFdFybCsgDvfyYn'; then
- at_home=true
-fi
-echo "$0: at_home = $at_home"
-
-source /a/bin/bash_unpublished/source-state
-#### begin convert private hostnames to public hostnames ####
-#if ! $at_home; then
-# for var in old_host new_host; do
-# case ${!var} in
-# tp)
-# eval $var=$HOME_DOMAIN
-# ;;
-# esac
-# done
-#fi
-#### end convert private hostnames to public hostnames ####
-
-
-# because our port forward is not robust enough, we can't use proxy command,
-# todo: setup vpn so this is all taken care of.
-if ! $update_wrt; then
- wrt_shell=:
-else
- wrt_shell="ssh wrt.b8.nz"
-fi
-
-btrbk_test="systemctl is-active btrbk.service"
-while $new_shell $btrbk_test || $old_shell $btrbk_test; do
- echo "$0: btrbk is running on new or old host. sleeping for 8 seconds"
- sleep 6
- echo "$0: testing for btrbk activity in 2 seconds"
- sleep 2
-done
-
+e $new_shell hostname
new_hostname=$($new_shell hostname)
########### end initial processing, begin actually modifying things ##########
-restore_new_btrbk=false
if $new_shell systemctl is-active btrbk.timer; then
- $new_shell sudo systemctl stop btrbk.timer
+ m $new_shell sudo systemctl stop btrbk.timer
restore_new_btrbk=true
fi
-restore_old_btrbk=false
if $old_shell systemctl is-active btrbk.timer; then
- $old_shell sudo systemctl stop btrbk.timer
+ m $old_shell sudo systemctl stop btrbk.timer
restore_old_btrbk=true
fi
+btrbk_test="systemctl is-active btrbk.service"
+while true; do
+ for shell in "$new_shell" "$old_shell"; do
+ e $shell $btrbk_test
+ status=$($shell $btrbk_test) ||:
+ case $status in
+ inactive|failed) : ;;
+ *)
+ e "btrbk active on shell:$shell, status:$status, sleeping 8 seconds"
+ sleep 8
+ continue
+ ;;
+ esac
+ done
+ break
+done
+
+# ensure these are unused before doing anything
+e "umounting /m and /o via $new_shell"
$new_shell bash -xs <<'EOF'
set -eE
if mountpoint -q /m; then sudo umount /m; fi
# I think exim will try ipv6 first, so no need to disable
# ipv6 i think.
-$old_shell primary-setup $new_hostname
+m $old_shell /a/exe/primary-setup $new_hostname
if $localhost_new; then
- btrbk-run -s $old_host $mp_args
+ m btrbk-run -v -s $old_host $mp_args
else
- btrbk-run -t $new_host $mp_args
+ m btrbk-run -v -t $new_host $mp_args
fi
-$new_shell primary-setup $new_hostname
-
-if $restore_new_btrbk; then
- $new_shell sudo systemctl start btrbk.timer
-fi
-if $restore_old_btrbk; then
- $old_shell sudo systemctl start btrbk.timer
-fi
+m $new_shell /a/exe/primary-setup $new_hostname
iankelling.org / git / distro-setup / blobdiff