From a051ae95220a0cf53e11bfbc4d2993a9ab31abf9 Mon Sep 17 00:00:00 2001
From: Steffen Ritter
Date: Thu, 8 Feb 2024 19:27:27 +0100
Subject: [SS?S] Use correct tmate config file

---
 satellit_installer/static_files/system/etc/tmate.conf | 5 -----
 satellit_installer/static_files/system/etc/tmux.conf  | 5 +++++
 satellit_upgrader/updater.template.sh                 | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 satellit_installer/static_files/system/etc/tmate.conf
 create mode 100644 satellit_installer/static_files/system/etc/tmux.conf

diff --git a/satellit_installer/static_files/system/etc/tmate.conf b/satellit_installer/static_files/system/etc/tmate.conf
deleted file mode 100644
index 537f52c..0000000
--- a/satellit_installer/static_files/system/etc/tmate.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-set -g tmate-server-host "tmate.ruf.uni-freiburg.de"
-set -g tmate-server-port 2222
-set -g tmate-server-rsa-fingerprint SHA256:pyT0YTJ+2c6AHD4QtUC1GEA9SFFYba74x2T1VZJ6zpc
-set -g tmate-server-ed25519-fingerprint SHA256:ZuTqO8YZrdgzjskHhfNd65es4HEx5rKBRZj/e/iBLrg
-set -g tmate-identity ""
diff --git a/satellit_installer/static_files/system/etc/tmux.conf b/satellit_installer/static_files/system/etc/tmux.conf
new file mode 100644
index 0000000..537f52c
--- /dev/null
+++ b/satellit_installer/static_files/system/etc/tmux.conf
@@ -0,0 +1,5 @@
+set -g tmate-server-host "tmate.ruf.uni-freiburg.de"
+set -g tmate-server-port 2222
+set -g tmate-server-rsa-fingerprint SHA256:pyT0YTJ+2c6AHD4QtUC1GEA9SFFYba74x2T1VZJ6zpc
+set -g tmate-server-ed25519-fingerprint SHA256:ZuTqO8YZrdgzjskHhfNd65es4HEx5rKBRZj/e/iBLrg
+set -g tmate-identity ""
diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index 85066dd..9ecbc88 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -853,7 +853,7 @@ if ! which tmate &> /dev/null && (( MAJOR >= 9 )); then
 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" "/etc/tmate.conf" "Updating tmate config..."
+	diffcp "system" "/etc/tmux.conf" "Updating tmate config..."
 	rm -f -- "/root/.tmate.conf"
 fi
 
-- 
cgit v1.2.3-55-g7522