grendervill/glchat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(deploy): ssh при загрузке сертификата не читает stdin (ломало sudo -S)

Browse Source
This commit is contained in:
grendervill
2026-09-19 20:29:39 +03:00
parent aefaf36108
commit 8ff7831dc7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy/install.sh
+2 -2
View File
@@ -753,7 +753,7 @@ turn_shared_secret() {
# контейнер LiveKit. Продление выполняет glchat-cert-refresh.timer. # контейнер LiveKit. Продление выполняет glchat-cert-refresh.timer.
fetch_remote_turn_certificate() { fetch_remote_turn_certificate() {
[ -n "$TURN_CERT_REMOTE" ] || return 1 [ -n "$TURN_CERT_REMOTE" ] || return 1
local ssh_opts=(-o BatchMode=yes -o StrictHostKeyChecking=accept-new -p "$TURN_CERT_SSH_PORT") local ssh_opts=(-n -o BatchMode=yes -o StrictHostKeyChecking=accept-new -p "$TURN_CERT_SSH_PORT")
[ -n "$TURN_CERT_SSH_KEY" ] && ssh_opts+=(-i "$TURN_CERT_SSH_KEY") [ -n "$TURN_CERT_SSH_KEY" ] && ssh_opts+=(-i "$TURN_CERT_SSH_KEY")
command -v ssh >/dev/null 2>&1 || { command -v ssh >/dev/null 2>&1 || {
warn "ssh не найден: не могу забрать сертификат с ${TURN_CERT_REMOTE}" warn "ssh не найден: не могу забрать сертификат с ${TURN_CERT_REMOTE}"
@@ -911,7 +911,7 @@ TMP_CRT="\$(mktemp)"; TMP_KEY="\$(mktemp)"
trap 'rm -f "\$TMP_CRT" "\$TMP_KEY"' EXIT trap 'rm -f "\$TMP_CRT" "\$TMP_KEY"' EXIT
if [ -n "\$REMOTE" ]; then if [ -n "\$REMOTE" ]; then
ssh_opts="-o BatchMode=yes -o StrictHostKeyChecking=accept-new -p \$SSH_PORT" ssh_opts="-n -o BatchMode=yes -o StrictHostKeyChecking=accept-new -p \$SSH_PORT"
[ -n "\$SSH_KEY" ] && ssh_opts="\$ssh_opts -i \$SSH_KEY" [ -n "\$SSH_KEY" ] && ssh_opts="\$ssh_opts -i \$SSH_KEY"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
ssh \$ssh_opts "\$REMOTE" "cat '\$REMOTE_CRT'" >"\$TMP_CRT" || exit 1 ssh \$ssh_opts "\$REMOTE" "cat '\$REMOTE_CRT'" >"\$TMP_CRT" || exit 1