X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=switch-mail-host;h=b3e78325be1ae01d70d25b734cf991d5dbad86d7;hb=b857462732e15f455e41f26e3048a390d7b399c0;hp=ab57c13c012fd3a6a1850180ac6f4ff0fc48eb46;hpb=3a5055dce8796a1946d9f75d8c74605eb73d19df;p=distro-setup

diff --git a/switch-mail-host b/switch-mail-host
index ab57c13..b3e7832 100755
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -22,7 +22,6 @@ EOF
 ##### begin command line parsing ########
 
 update_wrt=true # default
-long_opt=foo # default
 temp=$(getopt -l help wh "$@") || usage 1
 eval set -- "$temp"
 while true; do
@@ -74,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 ####
 
 
@@ -121,6 +120,7 @@ if $old_shell systemctl is-active btrbk.timer; then
     restore_old_btrbk=true
 fi
 
+
 $new_shell bash -s <<'EOF'
 set -eE
 if mountpoint /m; then sudo umount /m; fi
@@ -139,16 +139,12 @@ 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_host
 
 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.
@@ -198,10 +194,10 @@ target send-receive $btrbk_dst
 EOF
 
 
-sudo btrbk --progress run
+sudo btrbk -l debug --progress run
+$new_shell /a/bin/distro-setup/install-my-scripts
 $new_shell mount-latest-subvol
-
-mail-setup
+$new_shell primary-setup $new_host
 
 if $restore_new_btrbk; then
     $new_shell sudo systemctl start btrbk.timer