From 50e6df775c128bec7508681ab5a92901876a8725 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Fri, 4 Jul 2025 14:27:49 +0900 Subject: [PATCH] Base setup, shell must be set, fix remote host check --- src/bin/base_setup.sh | 3 ++- src/bin/new_clone.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bin/base_setup.sh b/src/bin/base_setup.sh index ae5ee6a..18ee1ea 100755 --- a/src/bin/base_setup.sh +++ b/src/bin/base_setup.sh @@ -82,7 +82,8 @@ else # User for sudo, but only if SUDO is enabled if [ "${USE_SUDO}" != "0" ]; then echo "+ Add user ${WWW_GROUP}:${SUDO_USER} with base folder ${GIT_WEBHOOK_BASE_FOLDER}"; - useradd -d "${GIT_WEBHOOK_BASE_FOLDER}" -m -s /usr/sbin/nologin "${SUDO_USER}" + # Note: we need to set bin bash or we cannot use Jump Host + useradd -d "${GIT_WEBHOOK_BASE_FOLDER}" -m -s /bin/bash "${SUDO_USER}" fi; if [ ! -d "${GIT_WEBHOOK_BASE_FOLDER}" ]; then echo "+ Create Folder: ${GIT_WEBHOOK_BASE_FOLDER}"; diff --git a/src/bin/new_clone.sh b/src/bin/new_clone.sh index eaeadb8..7911e42 100755 --- a/src/bin/new_clone.sh +++ b/src/bin/new_clone.sh @@ -45,7 +45,7 @@ else # make sure the identiy file is there # grep "IdentityFile" in this SSH_TEST=("${SUDO_COMMAND[@]}" "ssh" "${REMOTE_HOST}"); - result=$("${SSH_TEST[@]}"); + result=$("${SSH_TEST[@]}" 2>&1); validate_string="You've successfully authenticated with the key" if [[ "$result" != *"$validate_string"* ]]; then echo "Could not connect to ${REMOTE_HOST}: ${result}";