X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=switch-mail-host;h=fd3d032cce84c34bec53d82b90f430f5bb0a0308;hb=103a2e153f844343c359882079936b2521c82f15;hp=12bf126e1f2512179915933ebacf0ebeb6ec0513;hpb=7d9ec600a5ed9f88b85e02a27ee017b85721a6ac;p=distro-setup diff --git a/switch-mail-host b/switch-mail-host index 12bf126..fd3d032 100644 --- a/switch-mail-host +++ b/switch-mail-host @@ -12,6 +12,8 @@ filesystems unless passing -o. -i Disallow incremental backup. -o Only btrbk /o, instead of all filesystems. +--force Run even though our local state does not say that MAIL_HOST is + us when pushing or HOST when pulling. -h|--help Print help and exit. I used to adjust home network dns so NEW_HOST resolves locally if it is @@ -23,6 +25,8 @@ EOF exit $1 } +script_name="${BASH_SOURCE[0]}" +script_name="${script_name##*/}" restore_new_btrbk=false restore_old_btrbk=false @@ -37,7 +41,7 @@ err-cleanup() { fi } -pre="${0##*/}:" +pre="$script_name:" m() { printf "$pre %s\n" "$*"; "$@"; } e() { printf "$pre %s\n" "$*"; } err() { echo "$pre ERROR: $*" >&2; } @@ -50,6 +54,8 @@ fi ##### begin command line parsing ######## +mail_only=false +host2_only=false force=false mp_args="-m /o,/q,/a" temp=$(getopt -l force,help ioh "$@") || usage 1 @@ -58,7 +64,8 @@ while true; do case $1 in --force) force=true ;; -i) incremental_arg="-i" ;; - -o) mp_args="-m /o" ;; + -o) + mail_only=true ;; -h|--help) usage ;; --) shift; break ;; *) echo "$0: Internal error! unexpected args: $*" ; exit 1 ;; @@ -74,28 +81,36 @@ if [[ ! $HOSTNAME ]]; then exit 1 fi -case $1 in +source /a/bin/bash_unpublished/source-state + +direction=$1 +host=$2 +case $direction in push) old_host=$HOSTNAME old_hostname=$HOSTNAME - new_host=$2 + new_host=$host bbk_args="-t $new_host" new_shell="ssh -F $HOME/.ssh/confighome root@$new_host" $new_shell -v hostname new_hostname=$($new_shell hostname) ;; pull) - old_host=$2 + old_host=$host new_host=$HOSTNAME new_hostname=$HOSTNAME bbk_args="-s $old_host" old_shell="ssh -F $HOME/.ssh/confighome root@$old_host" - # tests ssh connection - if ! old_hostname=$($old_shell hostname); then - echo "retrying failed $old_shell with -v" + # tests ssh connection. crafted this to not need to do escape chars + f=/a/bin/bash_unpublished/source-state + if ! old_info=($($old_shell "hostname; sed -n s,.*MAIL_HOST=,,p $f; sed -n s,.*HOST2=,,p $f")); then + echo "$pre: error: failed ssh. retrying failed $old_shell with -v for more info:" $old_shell -v hostname exit 1 fi + old_hostname=${old_info[0]} + MAIL_HOST=${old_info[1]} + HOST2=${old_info[2]} ;; *) err invalid first argument @@ -103,7 +118,28 @@ case $1 in ;; esac -source /a/bin/bash_unpublished/source-state +case $script_name in + switch-mail-host) + if [[ $MAIL_HOST != "$HOST2" ]]; then + mail_only=true + fi + ;; + switch-host2) + host2_only=true + ;; + *) + err unexpected script name + ;; +esac + + +if $mail_only; then + mp_args="-m /o" +elif $host2_only; then + mp_args="-m /a,/ar,/q,/qr" +fi + + if [[ $old_hostname != "$MAIL_HOST" ]] && ! $force; then err "\$old_hostname($old_hostname) != \$MAIL_HOST($MAIL_HOST). Rerun with --force if you really want this." @@ -149,17 +185,21 @@ while $active; do done # ensure these are unused before doing anything - e "On $new_host: umounting /m and /o, checking emacs" -$new_shell bash -s <<'EOF' +{ + cat <<'EOF' set -eE -if pgrep -f 'emacs --daemon' &>/dev/null; then +if pgrep -G iank -u iank -f 'emacs --daemon' &>/dev/null; then + export XDG_RUNTIME_DIR=/run/user/1000 bufs="$(emacsclient --eval "$(cat /a/bin/ds/unsaved-buffers.el)"| sed '/^"nil"$/d;s/^"(/E: /;s/)"$//')" if [[ $bufs ]]; then echo "error: on $HOSTNAME, unsaved emacs files: $bufs" >&2 exit 1 fi fi +EOF + if ! $host2_only; then + cat <<'EOF' for dir in m o; do if mountpoint -q /$dir; then echo On $new_host: umount /$dir @@ -167,9 +207,12 @@ for dir in m o; do fi done EOF + fi +} | $new_shell bash -s $old_shell bash -s <<'EOF' -if pgrep -f 'emacs --daemon' &>/dev/null; then +if pgrep -G iank -u iank -f 'emacs --daemon' &>/dev/null; then + export XDG_RUNTIME_DIR=/run/user/1000 bufs="$(emacsclient --eval "$(cat /a/bin/ds/unsaved-buffers.el)"| sed '/^"nil"$/d;s/^"(/E: /;s/)"$//')" if [[ $bufs ]]; then echo "error: on $HOSTNAME, unsaved emacs files: $bufs" >&2 @@ -200,9 +243,18 @@ if ! m btrbk-run -v $bbk_args $incremental_arg $mp_args; then exit $ret fi +if ! $mail_only; then + m $old_shell sed -ri "s/HOST2=.*/HOST2=$new_hostname/" /a/bin/bash_unpublished/source-state + m $new_shell sed -ri "s/HOST2=.*/HOST2=$new_hostname/" /a/bin/bash_unpublished/source-state +fi + +if $host2_only; then + exit 0 +fi + if ! m $old_shell /a/exe/primary-setup $new_hostname; then ret=$? - err "failed \$old_shell primary-setup \$new_hostname. fix and rerun switch-mail-host" + err "failed \$old_shell primary-setup \$new_hostname. fix and rerun $script_name" exit $ret fi