X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=switch-mail-host;h=9b4872db4b189c56245a3d31746976e027e855b9;hb=0310db0c0589445a132e77f0b7a8fbb5e1ae3082;hp=c74c54a989ac9b9d1ec7641c4450d7485ac1a8b4;hpb=4c39892ef8fa3379ce36adbe870723324cb71cea;p=distro-setup

diff --git a/switch-mail-host b/switch-mail-host
index c74c54a..9b4872d 100755
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -11,7 +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.
 
-
+-w         Don't try to ssh to wrt. Should only be used in unusual network situation.
 -h|--help  Print help and exit.
 
 Note: Uses GNU getopt options parsing style
@@ -21,12 +21,24 @@ EOF
 
 ##### begin command line parsing ########
 
-if (( $# != 2 )) || [[ $1 == -* || $2 == -* ]]; then
-    usage 1
-fi
+update_wrt=true # default
+temp=$(getopt -l help wh "$@") || usage 1
+eval set -- "$temp"
+while true; do
+    case $1 in
+        -w) update_wrt=false; shift ;;
+        -h|--help) usage ;;
+        --) shift; break ;;
+        *) echo "$0: Internal error! unexpected args: $*" ; exit 1 ;;
+    esac
+done
+
+
+(( $# == 2 )) || usage 1
 
 old_host=$1
 new_host=$2
+source /a/bin/bash_unpublished/source-semi-priv
 
 if [[ $old_host != $MAIL_HOST ]]; then
     read -p "warning: \$old_host != \$MAIL_HOST: $old_host != $MAIL_HOST, proceed? y/N "
@@ -54,7 +66,7 @@ if [[ ! $new_host || ! $old_host ]]; then
 fi
 
 at_home=false
-if [[ $HOSTNAME == treetowl ]] || [[ $HOSTNAME == frodo ]] || timeout -s 9 5 ssh wrt.b8.nz :; then
+if [[ $HOSTNAME == tp ]] || [[ $HOSTNAME == frodo ]] || timeout -s 9 5 ssh wrt.b8.nz :; then
     at_home=true
 fi
 echo "$0: at_home = $at_home"
@@ -64,7 +76,7 @@ source /a/bin/bash_unpublished/source-semi-priv
 if ! $at_home; then
     for var in old_host new_host; do
         case ${!var} in
-            treetowl)
+            tp)
                 eval $var=$HOME_DOMAIN
                 ;;
         esac
@@ -75,14 +87,16 @@ fi
 
 # because our port forward is not robust enough, we can't use proxy command,
 # todo: setup vpn so this is all taken care of.
-if ! $at_home; then
+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
-else
-    wrt_shell="ssh wrt.b8.nz"
 fi
 
 btrbk_test="systemctl is-active btrbk.service"
@@ -106,6 +120,15 @@ if $old_shell systemctl is-active btrbk.timer; then
     restore_old_btrbk=true
 fi
 
+for ((i=0; i<10; i++)); do
+    $old_shell killall arbtt-capture || break
+    sleep 1
+    if [[ i == 9 ]]; then
+        warn="WARNING!!! failed to kill arbtt-capture"
+        fi
+    done
+
+
 $new_shell bash -s <<'EOF'
 set -eE
 if mountpoint /m; then sudo umount /m; fi
@@ -133,7 +156,7 @@ mail-setup() {
 mail-setup "$old_shell"
 
 sudo dd of=/etc/btrbk.conf <<'EOF'
-ssh_identity /root/.ssh/id_rsa
+ssh_identity /root/.ssh/home
 # Just a guess that local7 is a good facility to pick.
 # It's a bit odd that the transaction log has to be logged to
 # a file or syslog, while other output is sent to std out.
@@ -183,10 +206,10 @@ target send-receive $btrbk_dst
 EOF
 
 
-sudo btrbk --progress run
+sudo btrbk -l debug --progress run
 $new_shell mount-latest-subvol
 
-mail-setup
+mail-setup "$new_shell"
 
 if $restore_new_btrbk; then
     $new_shell sudo systemctl start btrbk.timer
@@ -194,3 +217,7 @@ fi
 if $restore_old_btrbk; then
     $old_shell sudo systemctl start btrbk.timer
 fi
+
+$new_shell DISPLAY=:0 arbtt-capture --sample-rate=10 &
+
+echo $warn