From e550beafd5d8a111903dc20f32f5ee86839ff3a9 Mon Sep 17 00:00:00 2001
From: Daniel Dolezal <d.dolezal97@protonmail.com>
Date: Fri, 6 Dec 2024 13:38:17 +0100
Subject: [PATCH] fix loading of sshd or teleport and get teleport output into
 console

---
 entrypoint-script/entrypoint.sh | 20 ++++++++++----------
 entrypoint-script/variables.sh  |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/entrypoint-script/entrypoint.sh b/entrypoint-script/entrypoint.sh
index 8f0b1dd..de13436 100755
--- a/entrypoint-script/entrypoint.sh
+++ b/entrypoint-script/entrypoint.sh
@@ -154,14 +154,6 @@ function create_folder_and_change_permissions {
   chown -R "$USER":"$USER" "$1"
 }
 
-function run_teleport_server() {
-  if [ -f "/etc/teleport.yaml" ]; then
-    echo "* STARTING Teleport Server"
-    teleport start -c /etc/teleport.yaml > /var/log/teleport.log 2>&1 &
-    sepurator
-	fi
-}
-
 function run_prometheus_exporter() {
   if [ "$RUN_PROMETHEUS_EXPORTER" != "false" ]; then
     create_folder_and_change_permissions "/var/log/"
@@ -186,6 +178,15 @@ function run_prometheus_exporter() {
     sepurator
   fi
 }
+
+function run_correct_ssh_service() {
+  if [ -f "/etc/teleport.yaml" ]; then
+    echo "* STARTING Teleport Server"
+    exec teleport start -c /etc/teleport.yaml 2>&1
+  else
+    exec /usr/sbin/sshd -D -e "$@" 2>&1
+  fi;
+}
 #####################################################################################################
 # Main Code
 #####################################################################################################
@@ -202,11 +203,10 @@ sepurator
 
 maintenance_enable
 show_timezone_output
-run_teleport_server
 run_prometheus_exporter
 run_install_script
 
 echo "* Init done! - Starting SSH-Daemon..."
 sepurator
 
-exec /usr/sbin/sshd -D -e "$@" #2> /var/log/sshd.log
+run_correct_ssh_service
diff --git a/entrypoint-script/variables.sh b/entrypoint-script/variables.sh
index a7e1466..8d064cf 100644
--- a/entrypoint-script/variables.sh
+++ b/entrypoint-script/variables.sh
@@ -1,4 +1,4 @@
-DOCKER_IMAGE_VERSION="2.0.0"
+DOCKER_IMAGE_VERSION="3.0.0"
 BORG_VERSION=$(borg -V)
 SSH_FOLDERS=( "/sshkeys/clients" "/sshkeys/host" )
 NODE_EXPORTER_DIR="/var/log"