X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fmigrate_pleroma.sh;h=1fc2ec828fefcce4f381756eabb5bd7b753d44d5;hb=6ba68e69ef9bbe917c72040be42ae7421ca755d8;hp=5eefc39f561c05941592c07c13a6252601a026cb;hpb=06e7f865feb169f359e28382200fe7d6c5d42673;p=config

diff --git a/buster/setup_scripts/migrate_pleroma.sh b/buster/setup_scripts/migrate_pleroma.sh
index 5eefc39..1fc2ec8 100755
--- a/buster/setup_scripts/migrate_pleroma.sh
+++ b/buster/setup_scripts/migrate_pleroma.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
-set -x
+
 # Heavily inspired by <https://docs.pleroma.social/backup.html>
 
 if [ "$#" -ne 1 ]; then
@@ -12,14 +12,11 @@ server_ip="$1"
 config_tree_prefix="${HOME}/config/buster"
 setup_scripts_dir="${config_tree_prefix}/setup_scripts"
 
-# So we're only asked once …
-eval $(ssh-agent)
-ssh-add
-
 cd "${setup_scripts_dir}"
 ./prepare_to_meet_server.sh "${server_ip}"
 read -p'Hit Enter when you are done.' ignore
-ssh plom@"${server_ip}" 'su -lc "cd config && git pull"'
-ssh plom@"${server_ip}" 'su -lc "cd config/buster/setup_scripts && ./backup_pleroma.sh"'
+eval $(ssh-agent) && ssh-add
+echo 'Enter password for root on target server next.'
+ssh plom@"${server_ip}" 'su -lc "cd config/buster/setup_scripts && git pull && ./backup_pleroma.sh"'
 scp plom@"${server_ip}":~/pleroma_backup.tar /home/plom/pleroma_backup.tar
 ./restore_pleroma.sh