lots of updates

[distro-setup] / switch-mail-host

diff --git a/switch-mail-host b/switch-mail-host
index 40cb8172ffd873deda5097e966903243e6b636c2..c74c54a989ac9b9d1ec7641c4450d7485ac1a8b4 100755 (executable)
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -37,15 +37,15 @@ fi
 
 if [[ $new_host == "$HOSTNAME" ]]; then
     localhost_new=true
-    new_shell="ssh $new_host"
+    new_shell=
 else
     localhost_new=false
-    new_shell=
+    new_shell="ssh $new_host"
 fi
 
-old_shell=
+old_shell="ssh $old_host"
 if [[ $old_host == "$HOSTNAME" ]]; then
-    old_shell="ssh $old_host"
+    old_shell=
 fi
 
 if [[ ! $new_host || ! $old_host ]]; then
@@ -54,7 +54,7 @@ if [[ ! $new_host || ! $old_host ]]; then
 fi
 
 at_home=false
-if [[ $HOSTNAME == treetowl ]] || [[ $HOSTNAME == frodo ]] || timeout -s 9 5 ssh wrt.lan :; then
+if [[ $HOSTNAME == treetowl ]] || [[ $HOSTNAME == frodo ]] || timeout -s 9 5 ssh wrt.b8.nz :; then
     at_home=true
 fi
 echo "$0: at_home = $at_home"
@@ -74,15 +74,19 @@ fi
 
 
 # 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
+# todo: setup vpn so this is all taken care of.
 if ! $at_home; then
-    wrt_shell="ssh $HOME_DOMAIN ssh wrt.lan"
+    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
 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
+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"
@@ -114,8 +118,8 @@ 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 <<EOFOUTER
-    cedit mail_host /etc/hosts <<'EOF' || /etc/init.d/dnsmasq restart
-\$(grep "\b$new_host\b" /etc/hosts | awk '{print $1}') mail.iankelling.org
+    cedit mail_host /etc/hosts <<EOF || /etc/init.d/dnsmasq restart
+\$(grep "\b$new_host\b" /etc/hosts | awk '{print \$1}') mail.iankelling.org
 EOF
 EOFOUTER
 fi
@@ -169,7 +173,7 @@ if $localhost_new; then
     btrbk_dst=/mnt/root/btrbk
 else
     btrbk_src=/mnt/root
-    btrbk_dst=ssh://$old_host/mnt/root/btrbk
+    btrbk_dst=ssh://$new_host/mnt/root/btrbk
 fi
 
 sudo tee -a /etc/btrbk.conf <<EOF