X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=switch-mail-host;h=3a362c3b5ace6bc2409d8226c75e684b459c5a1c;hb=768363d8771edb9d9ed82425fa772d77b90139c0;hp=fd3d032cce84c34bec53d82b90f430f5bb0a0308;hpb=103a2e153f844343c359882079936b2521c82f15;p=distro-setup diff --git a/switch-mail-host b/switch-mail-host index fd3d032..3a362c3 100644 --- a/switch-mail-host +++ b/switch-mail-host @@ -4,12 +4,16 @@ source /usr/local/lib/err usage() { cat <&2; } +die() { printf "%s\n" "$*" >&2; echo "exiting with status 1" >&2; exit 1; } if [[ $EUID != 0 ]]; then err "requires running as root" @@ -57,13 +62,28 @@ fi mail_only=false host2_only=false force=false -mp_args="-m /o,/q,/a" -temp=$(getopt -l force,help ioh "$@") || usage 1 +force_arg= +pull_reexec=false +mp_args="-m /o,/a,/ar,/q,/qd,/qr" +check_installed=false +orig_args=("$@") +if ! temp=$(getopt -l check-installed,force,pull-reexec,help afioh "$@"); then + err "args invalid. args=$*" +fi eval set -- "$temp" while true; do case $1 in - --force) force=true ;; + -a) snapshot_arg=resume ;; + --force|-f) + force=true + force_arg=-f + ;; + --check-installed) + check_installed=true + ;; -i) incremental_arg="-i" ;; + # internal option for rerunning under newer old_host when doing pull + --pull-reexec) pull_reexec=true;; -o) mail_only=true ;; -h|--help) usage ;; @@ -74,17 +94,47 @@ while true; do done -(( $# == 2 )) || usage 1 +if (( $# != 2 )) && ! $check_installed; then + err expected 2 args, got $# +fi if [[ ! $HOSTNAME ]]; then err "\$HOSTNAME is unset" exit 1 fi +uninstalled-file-die() { + die "on host=$HOSTNAME, uninstalled file $1. run install-my-scripts or rerun with -f" +} + + source /a/bin/bash_unpublished/source-state direction=$1 host=$2 + + +if ! $force && { $check_installed || [[ $direction == push ]]; } ; then + install_bin_files=( + mount-latest-subvol + check-subvol-stale + btrbk-run + switch-mail-host + ) + for f in ${install_bin_files[@]}; do + if ! diff -q /a/bin/ds/$f /usr/local/bin/$f; then + uninstalled-file-die $f + fi + done + if ! diff -q /a/bin/errhandle/err /usr/local/lib/err; then + uninstalled-file-die err + fi + if $check_installed; then + exit 0 + fi +fi + + case $direction in push) old_host=$HOSTNAME @@ -92,8 +142,10 @@ case $direction in 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) + if ! new_hostname=$($new_shell hostname); then + echo "$pre: error: failed ssh. retrying failed $new_shell with -v for more info:" + $new_shell -v hostname + fi ;; pull) old_host=$host @@ -102,15 +154,31 @@ case $direction in bbk_args="-s $old_host" old_shell="ssh -F $HOME/.ssh/confighome root@$old_host" # tests ssh connection. crafted this to not need to do escape chars + + if ! $mail_only && ! $pull_reexec ; then + if ! $force; then + if ! $old_shell switch-mail-host --check-installed; then + die "failed: $old_shell switch-mail-host --check-installed" + fi + fi + tmpf=$(mktemp) + m scp -F $HOME/.ssh/confighome root@$old_host:/usr/local/bin/switch-mail-host $tmpf + if ! diff -q $tmpf ${BASH_SOURCE[0]}; then + e "found different version on old_host=$old_hostname, reexecing" + m install -T $tmpf /usr/local/bin/switch-mail-host + m /usr/local/bin/switch-mail-host --pull-reexec "${orig_args[@]}" + mexit 0 + fi + fi + 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 + 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]} + read -d '' -r old_hostname MAIL_HOST HOST2 <<<"$old_info" || (( $? == 1 )) + ;; *) err invalid first argument @@ -132,18 +200,22 @@ case $script_name in ;; esac - if $mail_only; then mp_args="-m /o" elif $host2_only; then - mp_args="-m /a,/ar,/q,/qr" + mp_args="-m /a,/ar,/q,/qd,/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." - exit 1 +if ! $force; then + if $host2_only; then + if [[ $old_hostname != "$HOST2" ]]; then + err "\$old_hostname($old_hostname) != \$HOST2($HOST2). Rerun with --force if you really want this." + exit 1 + fi + elif [[ $old_hostname != "$MAIL_HOST" ]]; then + err "\$old_hostname($old_hostname) != \$MAIL_HOST($MAIL_HOST). Rerun with --force if you really want this." + exit 1 + fi fi if [[ ! $new_host || ! $old_host ]]; then @@ -190,8 +262,7 @@ e "On $new_host: umounting /m and /o, checking emacs" cat <<'EOF' set -eE 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/)"$//')" + bufs="$(sudo -u iank env XDG_RUNTIME_DIR=/run/user/1000 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 @@ -199,27 +270,37 @@ if pgrep -G iank -u iank -f 'emacs --daemon' &>/dev/null; then fi EOF if ! $host2_only; then - cat <<'EOF' + cat </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/)"$//')" + bufs="$(sudo -u iank env XDG_RUNTIME_DIR=/run/user/1000 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 + +# Try to prevent emacs from saving stale data it has in memory to disk. eg: files, recentf list, etc. +# But if emacs ignores the signal, let it live. +killall -q emacs ||: + +if [[ -e /p/profanity-here ]]; then + systemctl disable --now profanity +fi EOF +fi # previously, I was checking to see if the new mail host # is on my home network, then changing my home dns @@ -237,8 +318,8 @@ EOF e Running initial btrbk -if ! m btrbk-run -v $bbk_args $incremental_arg $mp_args; then - ret=$? +m btrbk-run -v $bbk_args $force_arg $incremental_arg $mp_args $snapshot_arg || ret=$? +if (( ret )); then err "failed initial btrbk" exit $ret fi @@ -249,21 +330,25 @@ if ! $mail_only; then fi if $host2_only; then + if [[ $old_hostname != "$MAIL_HOST" && $old_hostname != kd ]]; then + m $old_shell systemctl --now disable btrbk.timer + fi + m $new_shell systemctl --now enable btrbk.timer + if [[ -e /p/profanity-here ]]; then + m $new_shell systemctl --now enable profanity + fi exit 0 fi -if ! m $old_shell /a/exe/primary-setup $new_hostname; then - ret=$? +m $old_shell /a/exe/primary-setup $new_hostname || ret=$? +if (( ret )); then err "failed \$old_shell primary-setup \$new_hostname. fix and rerun $script_name" exit $ret fi -# Try to prevent emacs from saving stale data it has in memory to disk. eg: files, recentf list, etc. -# But if emacs ignores the signal, let it live. -m $new_shell killall -q emacs ||: e Running main btrbk -m btrbk-run -v $bbk_args $incremental_arg -m /o || ret=$? +m btrbk-run -v --fast $bbk_args $force_arg $incremental_arg -m /o || ret=$? if (( ret )); then 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 @@ -271,6 +356,10 @@ if (( ret )); then exit $ret fi +# new system is usable at this point +blocks=██████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████ +printf "%s\n" "$(tput setaf 5 2>/dev/null ||:)${blocks:0:${COLUMNS:-180}}$(tput sgr0 2>/dev/null||:)" + # once I accidentally accepted incoming mail on old host. I used this script to copy over that mail: # # die=false; for d in o.leaf.2021-05-29T10:02:08-0400/m/{4e,md,4e2}/{,l/}!(*myarchive)/new; do if $die; then break; fi; find $d -type f -mtime -5 | while read -r f; do dir="${f%new/*}"; dir="btrbk/o.20210530T000011-0400/${dir#*/}"; fname="${f##*/}"; [[ -e $dir/new/$fname || -e $dir/cur/$fname ]] && continue; if ! e cp -a $f /${dir#*/*/}new; then echo failed cp; die=true; break; fi ; done; done @@ -279,10 +368,18 @@ fi # # shopt -s nullglob; find . -type f -mtime -2 | while read -r f; do a=( /m/4e/Sent/cur/${f%,*}* ); if (( ${#a[@]} )); then e exists $a; else m cp -a $f /m/4e/Sent/cur; fi; done -if ! m $new_shell /a/exe/primary-setup localhost; then - ret=$? +m $new_shell /a/exe/primary-setup localhost || ret=$? +if (( ret )); then err "failed final primary-setup, just fix and rerun: $new_shell /a/exe/primary-setup localhost" exit $ret fi +if ! $mail_only && [[ -e /p/profanity-here ]]; then + m $new_shell systemctl --now enable profanity || ret=$? + if (( ret )); then + err "failed final systemctl --now enable profanity, just fix and rerun" + exit $ret + fi +fi + m exit 0