X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=switch-mail-host;h=a0c590d0ae8b3287715584cda9eaf26119eb8c15;hb=32a1673064cfd9eaa165b4ea62fa416f02f3dfd2;hp=c67f30635570876f499860e3a98f0c69aaeb4a53;hpb=93db0c16393fe75efef3167c1d2b332f50387c23;p=distro-setup

diff --git a/switch-mail-host b/switch-mail-host
index c67f306..a0c590d 100755
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -1,35 +1,53 @@
 #!/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
+Usage: ${0##*/} push|pull 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
+    e WARNING: due to failure, btrbk.timer may need manual restoration:
+    e $new_shell sudo systemctl start btrbk.timer
+  fi
+  if $restore_old_btrbk; then
+    e WARNING: due to failure, btrbk.timer may need manual restoration:
+    e $old_shell sudo systemctl start btrbk.timer
+  fi
+}
+b
+pre="${0##*/}:"
+m() { printf "$pre %s\n"  "$*"; "$@"; }
+e() { printf "$pre %s\n"  "$*"; }
+err() { echo "[$(date +'%Y-%m-%d %H:%M:%S%z')]: $pre: $*" >&2; }
+
 ##### begin command line parsing ########
 
-update_wrt=true # default
-temp=$(getopt -l help wh "$@") || usage 1
-mp_args=
+temp=$(getopt -l help owh "$@") || usage 1
+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 ;;
@@ -39,28 +57,35 @@ done
 
 (( $# == 2 )) || usage 1
 
-old_host=$1
-new_host=$2
-source /a/bin/bash_unpublished/source-semi-priv
 
-if [[ $old_host != $MAIL_HOST ]]; then
-  read -p "warning: \$old_host != \$MAIL_HOST: $old_host != $MAIL_HOST, proceed? y/N "
-  if [[ $REPLY != [yY] ]]; then
+case $1 in
+  push)
+    new_host=$2
+    bbk_args="-s $old_host"
+    new_shell="ssh $new_host"
+    old_host=$HOSTNAME
+    ;;
+  pull)
+    old_host=$2
+    bbk_args="-t $new_host"
+    bbk_args="-s $old_host"
+    new_host=$HOSTNAME
+    old_shell="ssh $old_host"
+    ;;
+  *)
+    err invalid first argument
     exit 1
-  fi
-fi
+    ;;
+esac
 
-if [[ $new_host == "$HOSTNAME" ]]; then
-  localhost_new=true
-  new_shell=
-else
-  localhost_new=false
-  new_shell="ssh $new_host"
-fi
 
-old_shell="ssh $old_host"
-if [[ $old_host == "$HOSTNAME" ]]; then
-  old_shell=
+source /a/bin/bash_unpublished/source-state
+
+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
 fi
 
 if [[ ! $new_host || ! $old_host ]]; then
@@ -68,58 +93,42 @@ if [[ ! $new_host || ! $old_host ]]; then
   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-semi-priv
-#### 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
+  _errcatch_cleanup=cleanup
   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
+  _errcatch_cleanup=cleanup
   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
@@ -140,21 +149,16 @@ EOF
 # I think exim will try ipv6 first, so no need to disable
 # ipv6 i think.
 
-$old_shell primary-setup $new_hostname
 
-/a/bin/distro-setup/install-my-scripts
 
-if $localhost_new; then
-  btrbk-run -s $old_host $mp_args
-else
-  btrbk-run -t $new_host $mp_args
-fi
-
-$new_shell primary-setup $new_hostname
+m $old_shell /a/exe/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
+if ! m btrbk-run -v $bbk_args $mp_args; then
+  ret=$?
+  bang="$(printf "$(tput setaf 5)█$(tput sgr0)%.0s" 1 2 3 4 5 6 7)"
+  e $bang failed btrbk. restoring old host as primary
+  m $old_shell /a/exe/primary-setup localhost
+  exit $ret
 fi
+
+m $new_shell /a/exe/primary-setup localhost