X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=switch-mail-host;h=f26b945bea1a1b139a1232e08942fe8192f7a1af;hb=8452f3f3e0b837ba4e616e062787d726d7888b76;hp=288211264ee5e377c2aed0b523d29f33fb52809a;hpb=88d40e435fe7d525e033558101f0c0a8101c27b2;p=distro-setup

diff --git a/switch-mail-host b/switch-mail-host
old mode 100755
new mode 100644
index 2882112..f26b945
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -1,32 +1,51 @@
 #!/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.
 
--w         Don't try to ssh to wrt. Should only be used in unusual network situation.
+-o         Only btrbk /o, instead of all filesystems.
 -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
+    $new_shell sudo systemctl start btrbk.timer
+  fi
+  if $restore_old_btrbk; then
+    $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 wh "$@") || usage 1
+temp=$(getopt -l help owh "$@") || usage 1
+mp_args="-m /o,/q,/a"
 eval set -- "$temp"
 while true; do
   case $1 in
-    -w) update_wrt=false; shift ;;
+    -o) mp_args="-m /o"; shift ;;
     -h|--help) usage ;;
     --) shift; break ;;
     *) echo "$0: Internal error! unexpected args: $*" ; exit 1 ;;
@@ -38,10 +57,10 @@ done
 
 old_host=$1
 new_host=$2
-source /a/bin/bash_unpublished/source-semi-priv
+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
@@ -65,92 +84,60 @@ if [[ ! $new_host || ! $old_host ]]; then
   exit 1
 fi
 
-at_home=false
-if [[ $HOSTNAME == tp ]] || [[ $HOSTNAME == frodo ]] || timeout -s 9 5 ssh wrt.b8.nz :; 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
+source /a/bin/bash_unpublished/source-state
+
 
 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 [[ $($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
+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
 if mountpoint -q /o; then sudo umount /o; fi
 EOF
 
-# if new_host is not on home network, make mail.iankelling.org not resolve
-# on the home network.
-if [[ $new_host == $HOSTNAME ]] && ! $at_home; then
-  echo | $wrt_shell cedit mail_host /etc/hosts || [[ $? == 1 ]] # 1 means file changed.
-else
-  $wrt_shell bash -xs $new_host <<'EOFOUTER'
-new_host=$1
-cedit mail_host /etc/hosts <<EOF || /etc/init.d/dnsmasq restart
-$(grep "\b$new_hostname\b" /etc/hosts | awk '{print $1}') mail.iankelling.org
-EOF
-EOFOUTER
-fi
-
-$old_shell primary-setup $new_hostname
-
-/a/bin/distro-setup/install-my-scripts
+# previously, I was checking to see if the new mail host
+# is on my home network, then changing my home dns
+# to resolve on the local network, so that I didnt
+# have to send traffic out to the internet or rely
+# on that. However, that breaks for a laptop that roams.
+# So, we could have a cronjob that updates that dns,
+# however, another solution is to just use ipv6,
+# and I prefer that.
+#
+# TODO: enable ipv6 for email. exim config setting disables it.
+# need to add vpn support. need to add firewall / routing.
+# 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
-  btrbk-run -s $old_host -m /o
+  m btrbk-run -v -s $old_host $mp_args
 else
-  btrbk-run -t $new_host -m /o
+  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