X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=switch-mail-host;h=b67203aabc475608a4768cbcc2204126979ef48b;hb=8826440696abdfbfd6c7f5a40c95163bd489a1b1;hp=9315807d6ca00196574a06d967158c951f7becfc;hpb=dd2ab37728aeaf8b887d128c50601fb5d9bd8841;p=distro-setup

diff --git a/switch-mail-host b/switch-mail-host
index 9315807..b67203a 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 ####
 
 
@@ -120,14 +120,6 @@ 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
@@ -141,19 +133,16 @@ 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
+    if ! cedit mail_host /etc/hosts <<EOF; then
 \$(grep "\b$new_host\b" /etc/hosts | awk '{print \$1}') mail.iankelling.org
 EOF
+/etc/init.d/dnsmasq restart
 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_host
 
 sudo dd of=/etc/btrbk.conf <<'EOF'
 ssh_identity /root/.ssh/home
@@ -207,9 +196,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_host
 
 if $restore_new_btrbk; then
     $new_shell sudo systemctl start btrbk.timer
@@ -217,7 +206,3 @@ fi
 if $restore_old_btrbk; then
     $old_shell sudo systemctl start btrbk.timer
 fi
-
-$new_shell arbtt-capture --sample-rate=10 &
-
-echo $warn