X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=switch-mail-host;h=32642240dd17cf4e4978accfa2f4a27ea92cc14c;hb=6561b24248188e5bce423acab25c2c14c7e5ce6d;hp=c67f30635570876f499860e3a98f0c69aaeb4a53;hpb=93db0c16393fe75efef3167c1d2b332f50387c23;p=distro-setup

diff --git a/switch-mail-host b/switch-mail-host
old mode 100755
new mode 100644
index c67f306..3264224
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -23,7 +23,7 @@ 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
@@ -41,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 "
@@ -74,7 +74,7 @@ if timeout -s 9 5 ssh-keyscan -p 2220 -t rsa 10.0.0.1 2>/dev/null | grep -qFx '[
 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
@@ -96,14 +96,6 @@ else
   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 ##########
@@ -111,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
@@ -140,9 +142,7 @@ EOF
 # I think exim will try ipv6 first, so no need to disable
 # ipv6 i think.
 
-$old_shell primary-setup $new_hostname
-
-/a/bin/distro-setup/install-my-scripts
+$old_shell /a/exe/primary-setup $new_hostname
 
 if $localhost_new; then
   btrbk-run -s $old_host $mp_args
@@ -150,7 +150,7 @@ else
   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