X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=switch-mail-host;h=c67f30635570876f499860e3a98f0c69aaeb4a53;hb=c831645901a69a13197d07de05b5ec2720af91cf;hp=40cb8172ffd873deda5097e966903243e6b636c2;hpb=e7708e1261357b00d17f4baffb7051e97f7e8623;p=distro-setup diff --git a/switch-mail-host b/switch-mail-host index 40cb817..c67f306 100755 --- a/switch-mail-host +++ b/switch-mail-host @@ -4,189 +4,157 @@ set -eE -o pipefail trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR usage() { - cat </dev/null | grep -qFx '[10.0.0.1]:2220 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCH+/h1dGEfKEusBblndU2e6QT4wLCm5+yqr/sqh/0X9YfjR7BfWWm8nNmuP55cYc+Wuf5ljB1H1acXEcsl1y8e0j3agHfF0V74FE1N1zz5nn2Ep8NHnmqgEhza38ZxMPh+4p3X7zklEKU7+3SzybKBi8sg0wLzlS2LM0JaUN80zR2sK11Kye3dURUXPk78u5wodOkgcEYRwSYaDMJlUzWP+poRXIDJwFaMQnwmxbl/c84yOyaU0x/d6hFwoRscWecihX+vvBNeSyxR4xr2HDOyUWwJkctyAgt2p7w3tfkXOKcCRzTAjGVIMQLTvo0sG/yJbcyHoEFdFybCsgDvfyYn'; 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 - treetowl) - eval $var=$HOME_DOMAIN - ;; - esac - done -fi +#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: just open an ssh port to the world on wrt.lan -if ! $at_home; then - wrt_shell="ssh $HOME_DOMAIN ssh wrt.lan" +# todo: setup vpn so this is all taken care of. +if ! $update_wrt; then + wrt_shell=: else - wrt_shell="ssh wrt.lan" + 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 +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 +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 + $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 - restore_old_btrbk=true + $old_shell sudo systemctl stop btrbk.timer + restore_old_btrbk=true fi -$new_shell bash -s <<'EOF' + +$new_shell bash -xs <<'EOF' set -eE -if mountpoint /m; then sudo umount /m; fi -if mountpoint /o; then sudo umount /o; fi +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 -s <