Skip to content

Commit 024ae5c

Browse files
committed
Fix bug due to missing MaxStartups and MaxSessions
Unforunately go-gitea#16009 makes these settings mandatory. This PR uses the same technique as used for the certificates to make these settings non-mandatory. Fix go-gitea#16044 Signed-off-by: Andrew Thornton <[email protected]>
1 parent 072df3f commit 024ae5c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

docker/root/etc/s6/openssh/setup

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ if [ -d /etc/ssh ]; then
4747
SSH_RSA_CERT="${SSH_RSA_CERT:+"HostCertificate "}${SSH_RSA_CERT}" \
4848
SSH_ECDSA_CERT="${SSH_ECDSA_CERT:+"HostCertificate "}${SSH_ECDSA_CERT}" \
4949
SSH_DSA_CERT="${SSH_DSA_CERT:+"HostCertificate "}${SSH_DSA_CERT}" \
50+
SSH_MAX_STARTUPS="${SSH_MAX_STARTUPS:+"MaxStartups "}${SSH_MAX_STARTUPS}" \
51+
SSH_MAX_SESSIONS="${SSH_MAX_SESSIONS:+"MaxSessions "}${SSH_MAX_SESSIONS}" \
5052
envsubst < /etc/templates/sshd_config > /etc/ssh/sshd_config
5153

5254
chmod 0644 /etc/ssh/sshd_config

docker/root/etc/templates/sshd_config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ AddressFamily any
55
ListenAddress 0.0.0.0
66
ListenAddress ::
77

8-
MaxStartups ${SSH_MAX_STARTUPS}
9-
MaxSessions ${SSH_MAX_SESSIONS}
8+
${SSH_MAX_STARTUPS}
9+
${SSH_MAX_SESSIONS}
1010

1111
LogLevel INFO
1212

0 commit comments

Comments
 (0)