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

diff --git a/switch-mail-host b/switch-mail-host
index 11c0f40..a0c590d 100755
--- 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
@@ -26,17 +26,19 @@ restore_new_btrbk=false
 restore_old_btrbk=false
 cleanup() {
   if $restore_new_btrbk; then
-    m $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
-    m $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
-
+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 ########
 
@@ -55,8 +57,28 @@ done
 
 (( $# == 2 )) || usage 1
 
-old_host=$1
-new_host=$2
+
+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
+    ;;
+esac
+
+
 source /a/bin/bash_unpublished/source-state
 
 if [[ $old_host != "$MAIL_HOST" ]]; then
@@ -66,19 +88,6 @@ if [[ $old_host != "$MAIL_HOST" ]]; then
   fi
 fi
 
-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=
-fi
-
 if [[ ! $new_host || ! $old_host ]]; then
   echo "$0: bad args. see script"
   exit 1
@@ -91,10 +100,12 @@ new_hostname=$($new_shell hostname)
 
 if $new_shell systemctl is-active btrbk.timer; then
   m $new_shell sudo systemctl stop btrbk.timer
+  _errcatch_cleanup=cleanup
   restore_new_btrbk=true
 fi
 if $old_shell systemctl is-active btrbk.timer; then
   m $old_shell sudo systemctl stop btrbk.timer
+  _errcatch_cleanup=cleanup
   restore_old_btrbk=true
 fi
 
@@ -138,12 +149,16 @@ EOF
 # I think exim will try ipv6 first, so no need to disable
 # ipv6 i think.
 
+
+
 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
+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 $new_hostname
+m $new_shell /a/exe/primary-setup localhost