iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
various fies, change network
[distro-setup]
/
switch-mail-host
diff --git
a/switch-mail-host
b/switch-mail-host
index bac21484c89dc93ec67969c330a44377eecc9572..b3e78325be1ae01d70d25b734cf991d5dbad86d7 100755
(executable)
--- 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 ####
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 ####
#### end convert private hostnames to public hostnames ####
@@
-120,6
+120,7
@@
if $old_shell systemctl is-active btrbk.timer; then
restore_old_btrbk=true
fi
restore_old_btrbk=true
fi
+
$new_shell bash -s <<'EOF'
set -eE
if mountpoint /m; then sudo umount /m; fi
$new_shell bash -s <<'EOF'
set -eE
if mountpoint /m; then sudo umount /m; fi
@@
-138,13
+139,9
@@
EOF
EOFOUTER
fi
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
sudo dd of=/etc/btrbk.conf <<'EOF'
ssh_identity /root/.ssh/home
@@
-197,10
+194,10
@@
target send-receive $btrbk_dst
EOF
EOF
-sudo btrbk run
+sudo btrbk -l debug --progress run
+$new_shell /a/bin/distro-setup/install-my-scripts
$new_shell mount-latest-subvol
$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
if $restore_new_btrbk; then
$new_shell sudo systemctl start btrbk.timer