summaryrefslogtreecommitdiffstats
path: root/satellit_upgrader
diff options
context:
space:
mode:
authorSimon Rettberg2023-06-15 12:26:12 +0200
committerSimon Rettberg2023-06-15 12:26:12 +0200
commit3db26648ab2387c853b27f8f42ee0e3a0d927cb5 (patch)
tree1fb893854e4fcb8b63122ba6dbb83ce2422fce33 /satellit_upgrader
parent[SSUS] Use cmp instead of diff (diff)
downloadsetup-scripts-3db26648ab2387c853b27f8f42ee0e3a0d927cb5.tar.gz
setup-scripts-3db26648ab2387c853b27f8f42ee0e3a0d927cb5.tar.xz
setup-scripts-3db26648ab2387c853b27f8f42ee0e3a0d927cb5.zip
[SS*S] tmate now requires SHA256 fingerprints in its config file
Diffstat (limited to 'satellit_upgrader')
-rw-r--r--satellit_upgrader/updater.template.sh16
1 files changed, 4 insertions, 12 deletions
diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index 71d8097..287b3d2 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -843,18 +843,10 @@ if ! which tmate &> /dev/null && (( MAJOR >= 9 )); then
if ! aptinst tmate; then
pwarning "Could not install tmate. Easy remote assistance will not be available."
fi
- echo "Writing config..."
- cat > /root/.tmate.conf <<-JUSTANOTHERDOC
- set -g tmate-server-host "tmate.ruf.uni-freiburg.de"
- set -g tmate-server-port 2222
- set -g tmate-server-rsa-fingerprint "d7:d7:06:d0:b6:0d:75:a1:ad:ec:69:18:b3:a3:c0:4a"
- set -g tmate-server-ecdsa-fingerprint "4f:c9:81:f1:1a:20:7d:6f:97:12:f2:a9:0f:f4:c5:6c"
- set -g tmate-identity ""
- JUSTANOTHERDOC
-
- if which tmate &> /dev/null; then
- echo "tmate installation complete!"
- fi
+fi
+if (( MAJOR >= 11 )); then
+ # Fingerprints now need to be SHA256, maybe an old sat got dist-upgraded and still has MD5s in that file
+ diffcp "system" "/root/.tmate.conf" "Updating tmate config..."
fi
# ******************* make sure ssh keypair exists *********