X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=switch-mail-host;h=9ebd2a73cd1e41731e2318eea8cc9369bb9a7375;hp=9315807d6ca00196574a06d967158c951f7becfc;hb=e2fb88c7f8c32cf6442a399844bd2fbd1c912027;hpb=eb9b839bb5a91c60cc4f6eb9d7e38ffbf73f0e90

diff --git a/switch-mail-host b/switch-mail-host
index 9315807..9ebd2a7 100755
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -73,15 +73,15 @@ echo "$0: at_home = $at_home"
 
 source /a/bin/bash_unpublished/source-semi-priv
 #### begin convert private hostnames to public hostnames ####
-if ! $at_home; then
-    for var in old_host new_host; do
-        case ${!var} in
-            tp)
-                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 ####
 
 
@@ -107,6 +107,8 @@ while $new_shell $btrbk_test || $old_shell $btrbk_test; do
     sleep 2
 done
 
+new_hostname=$($new_shell hostname)
+
 ########### end initial processing, begin actually modifying things ##########
 
 restore_new_btrbk=false
@@ -120,19 +122,11 @@ 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'
+$new_shell bash -xs <<'EOF'
 set -eE
-if mountpoint /m; then sudo umount /m; fi
-if mountpoint /o; then sudo umount /o; fi
+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
@@ -140,20 +134,16 @@ EOF
 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
+    $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
 
-mail-setup() {
-    shell="$1"
-    $shell sed -ri "s/MAIL_HOST=.*/MAIL_HOST=$new_host/" /a/bin/bash_unpublished/source-semi-priv
-    $shell /a/bin/distro-setup/mail-setup exim4
-}
-
-mail-setup "$old_shell"
+$old_shell /a/bin/distro-setup/install-my-scripts
+$old_shell primary-setup $new_hostname
 
 sudo dd of=/etc/btrbk.conf <<'EOF'
 ssh_identity /root/.ssh/home
@@ -207,9 +197,9 @@ EOF
 
 
 sudo btrbk -l debug --progress run
+$new_shell /a/bin/distro-setup/install-my-scripts
 $new_shell mount-latest-subvol
-
-mail-setup "$new_shell"
+$new_shell primary-setup $new_hostname
 
 if $restore_new_btrbk; then
     $new_shell sudo systemctl start btrbk.timer
@@ -217,7 +207,3 @@ fi
 if $restore_old_btrbk; then
     $old_shell sudo systemctl start btrbk.timer
 fi
-
-$new_shell arbtt-capture --sample-rate=10 &
-
-echo $warn