X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=switch-mail-host;h=32642240dd17cf4e4978accfa2f4a27ea92cc14c;hb=6561b24248188e5bce423acab25c2c14c7e5ce6d;hp=61e8966f52aa3fa25ae84e4992e16a24e8e164ea;hpb=ebd0ea323de3eacc11e1a624f8cc4f961d8bdb6c;p=distro-setup diff --git a/switch-mail-host b/switch-mail-host old mode 100755 new mode 100644 index 61e8966..3264224 --- a/switch-mail-host +++ b/switch-mail-host @@ -4,147 +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 +source /a/bin/bash_unpublished/source-state #### 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 -if ! $at_home; then - ssh_cmd="ssh $HOME_DOMAIN ssh wrt" +# todo: setup vpn so this is all taken care of. +if ! $update_wrt; then + wrt_shell=: else - ssh_cmd="ssh wrt" -fi -# 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 | $ssh_cmd cedit mail_host /etc/hosts -else - $ssh_cmd bash -s <