various fixes, mostly for etiona

[distro-setup] / switch-mail-host

diff --git a/switch-mail-host b/switch-mail-host
index 10fcd9f12d82c580e1ee3536c2ac51ed08e9c969..eafe1044c0816c19aa7522b94445d6a3de7cec78 100644 (file)
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -4,7 +4,7 @@ source /usr/local/lib/err
 
 usage() {
   cat <<EOF
-Usage: ${0##*/} OLD_HOST NEW_HOST
+Usage: ${0##*/} push|pull 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
@@ -24,19 +24,22 @@ EOF
 
 restore_new_btrbk=false
 restore_old_btrbk=false
-cleanup() {
+err-cleanup() {
   if $restore_new_btrbk; then
-    $new_shell sudo systemctl start btrbk.timer
+    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
-    $old_shell sudo systemctl start btrbk.timer
+    e WARNING: due to failure, btrbk.timer may need manual restoration:
+    e $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"  "$*"; }
+err() { echo "$pre: ERROR: $*" >&2; }
+mexit() { echo "$pre: exiting with status $1"; exit $1; }
 
 ##### begin command line parsing ########
 
@@ -48,48 +51,55 @@ while true; do
     -o) mp_args="-m /o"; shift ;;
     -h|--help) usage ;;
     --) shift; break ;;
-    *) echo "$0: Internal error! unexpected args: $*" ; exit 1 ;;
+    *) echo "$0: Internal error! unexpected args: $*" ; mexit 1 ;;
   esac
 done
 
 
 (( $# == 2 )) || usage 1
 
-old_host=$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 [[ $REPLY != [yY] ]]; then
-    exit 1
-  fi
+if [[ ! $HOSTNAME ]]; then
+  err '$HOSTNAME is unset'
+  mexit 1
 fi
 
-if [[ $new_host == "$HOSTNAME" ]]; then
-  localhost_new=true
-  new_shell=
-else
-  localhost_new=false
-  new_shell="ssh $new_host"
-fi
+case $1 in
+  push)
+    old_host=$HOSTNAME
+    new_host=$2
+    bbk_args="-s $old_host"
+    new_shell="ssh $new_host"
+    new_hostname=$($new_shell hostname)
+    ;;
+  pull)
+    old_host=$2
+    new_host=$HOSTNAME
+    new_hostname=$HOSTNAME
+    bbk_args="-t $new_host"
+    bbk_args="-s $old_host"
+    old_shell="ssh $old_host"
+    # test ssh connection
+    $old_shell :
+    ;;
+  *)
+    err invalid first argument
+    mexit 1
+    ;;
+esac
 
-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
+  e "WARNING: \$old_host != \$MAIL_HOST. Sleeping for 5 seconds in case you want to reconsider"
+  sleep 5
 fi
 
 if [[ ! $new_host || ! $old_host ]]; then
   echo "$0: bad args. see script"
-  exit 1
+  mexit 1
 fi
 
 
-source /a/bin/bash_unpublished/source-state
-
-
-new_hostname=$($new_shell hostname)
-
 ########### end initial processing, begin actually modifying things ##########
 
 if $new_shell systemctl is-active btrbk.timer; then
@@ -102,11 +112,20 @@ if $old_shell systemctl is-active btrbk.timer; then
 fi
 
 btrbk_test="systemctl is-active btrbk.service"
-while [[ $($new_shell $btrbk_test) != inactive ]] || [[ $($old_shell $btrbk_test) != inactive ]]; 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
+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
@@ -132,12 +151,25 @@ EOF
 # I think exim will try ipv6 first, so no need to disable
 # ipv6 i think.
 
+
+e Running initial btrbk
+if ! m btrbk-run -v $bbk_args $mp_args; then
+  ret=$?
+  err "failed initial btrbk"
+  mexit $ret
+fi
+
 m $old_shell /a/exe/primary-setup $new_hostname
 
-if $localhost_new; then
-  m btrbk-run -v -s $old_host $mp_args
-else
-  m btrbk-run -v -t $new_host $mp_args
+e Running main btrbk
+if ! m btrbk-run -v $bbk_args -m /o; then
+  ret=$?
+  bang="$(printf "$(tput setaf 5)█$(tput sgr0)%.0s" 1 2 3 4 5 6 7)"
+  e $bang failed btrbk of /o. restoring old host as primary
+  m $old_shell /a/exe/primary-setup localhost
+  mexit $ret
 fi
 
-m $new_shell /a/exe/primary-setup $new_hostname
+m $new_shell /a/exe/primary-setup localhost
+
+mexit 0