X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=switch-mail-host;h=a0c590d0ae8b3287715584cda9eaf26119eb8c15;hb=32a1673064cfd9eaa165b4ea62fa416f02f3dfd2;hp=b3e78325be1ae01d70d25b734cf991d5dbad86d7;hpb=b857462732e15f455e41f26e3048a390d7b399c0;p=distro-setup diff --git a/switch-mail-host b/switch-mail-host index b3e7832..a0c590d 100755 --- a/switch-mail-host +++ b/switch-mail-host @@ -1,207 +1,164 @@ #!/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 <&2; } ##### 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 ;; - -h|--help) usage ;; - --) shift; break ;; - *) echo "$0: Internal error! unexpected args: $*" ; exit 1 ;; - esac + case $1 in + -o) mp_args="-m /o"; shift ;; + -h|--help) usage ;; + --) shift; break ;; + *) echo "$0: Internal error! unexpected args: $*" ; exit 1 ;; + esac 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 - exit 1 - fi -fi -if [[ $new_host == "$HOSTNAME" ]]; then - localhost_new=true - new_shell= -else - localhost_new=false +case $1 in + push) + new_host=$2 + bbk_args="-s $old_host" new_shell="ssh $new_host" -fi + 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 -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" +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 -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=: -elif $at_home; then - wrt_shell="ssh wrt.b8.nz" -else - if [[ $old_host == iank.vpn.office.fsf.org || $new_host == iank.vpn.office.fsf.org ]]; then - wrt_shell="ssh iank.vpn.office.fsf.org ssh wrt.b8.nz" - else - wrt_shell="ssh $HOME_DOMAIN ssh wrt.b8.nz" - fi +if [[ ! $new_host || ! $old_host ]]; then + echo "$0: bad args. see script" + exit 1 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 - restore_new_btrbk=true + 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 - restore_old_btrbk=true -fi - - -$new_shell bash -s <<'EOF' -set -eE -if mountpoint /m; then sudo umount /m; fi -if mountpoint /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 -s <