Skip to content

Commit

Permalink
Fix bug due to missing MaxStartups and MaxSessions (go-gitea#16046)
Browse files Browse the repository at this point in the history
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 <art27@cantab.net>

Co-authored-by: 6543 <6543@obermui.de>
  • Loading branch information
2 people authored and AbdulrhmnGhanem committed Aug 10, 2021
1 parent 519ac51 commit 43f5f89
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions docker/root/etc/s6/openssh/setup
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ if [ -d /etc/ssh ]; then
SSH_RSA_CERT="${SSH_RSA_CERT:+"HostCertificate "}${SSH_RSA_CERT}" \
SSH_ECDSA_CERT="${SSH_ECDSA_CERT:+"HostCertificate "}${SSH_ECDSA_CERT}" \
SSH_DSA_CERT="${SSH_DSA_CERT:+"HostCertificate "}${SSH_DSA_CERT}" \
SSH_MAX_STARTUPS="${SSH_MAX_STARTUPS:+"MaxStartups "}${SSH_MAX_STARTUPS}" \
SSH_MAX_SESSIONS="${SSH_MAX_SESSIONS:+"MaxSessions "}${SSH_MAX_SESSIONS}" \
envsubst < /etc/templates/sshd_config > /etc/ssh/sshd_config

chmod 0644 /etc/ssh/sshd_config
Expand Down
4 changes: 2 additions & 2 deletions docker/root/etc/templates/sshd_config
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ AddressFamily any
ListenAddress 0.0.0.0
ListenAddress ::

MaxStartups ${SSH_MAX_STARTUPS}
MaxSessions ${SSH_MAX_SESSIONS}
${SSH_MAX_STARTUPS}
${SSH_MAX_SESSIONS}

LogLevel INFO

Expand Down

0 comments on commit 43f5f89

Please sign in to comment.