X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=switch-mail-host;h=32642240dd17cf4e4978accfa2f4a27ea92cc14c;hb=c926b55471a48cbcd99607ce1e003da55211d166;hp=a06e1baec6c5abd9bd7ab3bf201fbe1e1524d9f1;hpb=0cc08a73110c15c4e7bbb8c8233a6c122c27490e;p=distro-setup

diff --git a/switch-mail-host b/switch-mail-host
old mode 100755
new mode 100644
index a06e1ba..3264224
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -11,6 +11,7 @@ Adjust home network dns so NEW_HOST resolves locally if it is on the
 local network.  Turn off mail receiving on OLD_HOST, run btrbk to move
 mail to NEW_HOST, turn on mail receiving on NEW_HOST.
 
+-o         Only btrbk /o, instead of all filesystems.
 -w         Don't try to ssh to wrt. Should only be used in unusual network situation.
 -h|--help  Print help and exit.
 
@@ -22,10 +23,12 @@ EOF
 ##### begin command line parsing ########
 
 update_wrt=true # default
-temp=$(getopt -l help wh "$@") || usage 1
+temp=$(getopt -l help owh "$@") || usage 1
+mp_args=
 eval set -- "$temp"
 while true; do
   case $1 in
+    -o) mp_args="-m /o"; shift ;;
     -w) update_wrt=false; shift ;;
     -h|--help) usage ;;
     --) shift; break ;;
@@ -38,7 +41,7 @@ done
 
 old_host=$1
 new_host=$2
-source /a/bin/bash_unpublished/source-semi-priv
+source /a/bin/bash_unpublished/source-state
 
 if [[ $old_host != $MAIL_HOST ]]; then
   read -p "warning: \$old_host != \$MAIL_HOST: $old_host != $MAIL_HOST, proceed? y/N "
@@ -66,12 +69,12 @@ if [[ ! $new_host || ! $old_host ]]; then
 fi
 
 at_home=false
-if [[ $HOSTNAME == tp ]] || [[ $HOSTNAME == frodo ]] || timeout -s 9 5 ssh wrt.b8.nz :; then
+if timeout -s 9 5 ssh-keyscan -p 2220 -t rsa 10.0.0.1 2>/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
@@ -89,24 +92,10 @@ source /a/bin/bash_unpublished/source-semi-priv
 # 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
+  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
-done
-
 new_hostname=$($new_shell hostname)
 
 ########### end initial processing, begin actually modifying things ##########
@@ -114,14 +103,24 @@ new_hostname=$($new_shell hostname)
 restore_new_btrbk=false
 if $new_shell systemctl is-active btrbk.timer; then
   $new_shell sudo systemctl stop btrbk.timer
+  echo "$0: note: stopped btrbk.timer on $new_host"
   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
+  echo "$0: note: stopped btrbk.timer on $old_host"
   restore_old_btrbk=true
 fi
 
+btrbk_test="systemctl is-active btrbk.service"
+while [[ $($new_shell $btrbk_test) != inactive ]] || [[ $($old_shell $btrbk_test) != inactive ]]; 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_shell bash -xs <<'EOF'
 set -eE
@@ -129,30 +128,29 @@ 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 -xs $new_host <<'EOFOUTER'
-new_host=$1
-cedit mail_host /etc/hosts <<EOF || /etc/init.d/dnsmasq restart
-$(grep "\b$new_hostname\b" /etc/hosts | awk '{print $1}') mail.iankelling.org
-EOF
-EOFOUTER
-fi
-
-$old_shell primary-setup $new_hostname
-
-/a/bin/distro-setup/install-my-scripts
+# previously, I was checking to see if the new mail host
+# is on my home network, then changing my home dns
+# to resolve on the local network, so that I didnt
+# have to send traffic out to the internet or rely
+# on that. However, that breaks for a laptop that roams.
+# So, we could have a cronjob that updates that dns,
+# however, another solution is to just use ipv6,
+# and I prefer that.
+#
+# TODO: enable ipv6 for email. exim config setting disables it.
+# need to add vpn support. need to add firewall / routing.
+# I think exim will try ipv6 first, so no need to disable
+# ipv6 i think.
+
+$old_shell /a/exe/primary-setup $new_hostname
 
 if $localhost_new; then
-  btrbk-run -s $old_host -m /o
+  btrbk-run -s $old_host $mp_args
 else
-  btrbk-run -t $new_host -m /o
+  btrbk-run -t $new_host $mp_args
 fi
 
-$new_shell primary-setup $new_hostname
+$new_shell /a/exe/primary-setup $new_hostname
 
 if $restore_new_btrbk; then
   $new_shell sudo systemctl start btrbk.timer