Browse Source

Fix #8453 by making openssh listen on SSH_LISTEN_PORT not SSH_PORT (#8477)

tags/v1.10.0-rc1
zeripath 4 years ago
parent
commit
0a96e59884
2 changed files with 3 additions and 2 deletions
  1. 1
    0
      docker/root/etc/s6/openssh/setup
  2. 2
    2
      docker/root/etc/templates/sshd_config

+ 1
- 0
docker/root/etc/s6/openssh/setup View File



if [ -d /etc/ssh ]; then if [ -d /etc/ssh ]; then
SSH_PORT=${SSH_PORT:-"22"} \ SSH_PORT=${SSH_PORT:-"22"} \
SSH_LISTEN_PORT=${SSH_LISTEN_PORT:-"${SSH_PORT}"} \
envsubst < /etc/templates/sshd_config > /etc/ssh/sshd_config envsubst < /etc/templates/sshd_config > /etc/ssh/sshd_config


chmod 0644 /etc/ssh/sshd_config chmod 0644 /etc/ssh/sshd_config

+ 2
- 2
docker/root/etc/templates/sshd_config View File

Port ${SSH_PORT}
Port ${SSH_LISTEN_PORT}
Protocol 2 Protocol 2


AddressFamily any AddressFamily any
Banner none Banner none
Subsystem sftp /usr/lib/ssh/sftp-server Subsystem sftp /usr/lib/ssh/sftp-server


AcceptEnv GIT_PROTOCOL
AcceptEnv GIT_PROTOCOL

Loading…
Cancel
Save