Skip to content

GitLab Shell: make extended configuration of sshd_config

Jason Plum requested to merge shell-opensshd-config-extension into master

What does this MR do?

GitLab Shell: make extended configuration of sshd_config

Allow extended configuration of OpenSSH sshd's sshd_config, outside of default chart values.

  1. Allow use of Include at default path
  2. Allow opensshd.supplemental_config verbatim string insertion to the end of the file (after Include)

Changelog: added

Note to maintainers

This will need backported to %16.7 and future, to match Upgrade debian from bullseye to bookworm (gitlab-org/build/CNG!1616 - merged)

Related issues

Related to https://gitlab.com/gitlab-com/gl-infra/gitlab-dedicated/team/-/issues/3887

Author checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion.

Required

  • Merge Request Title and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com
  • When ready for review, follow the instructions in the "Reviewer Roulette" section of the Danger Bot MR comment, as per the Distribution experimental MR workflow

For merge requests from forks, consider the following options for Danger to work properly:

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Tests added/updated
  • Integration tests added to GitLab QA
  • Equivalent MR/issue for omnibus-gitlab opened
  • Equivalent MR/issue for Gitlab Operator project opened (see Operator documentation on impact of Charts changes)
  • Validate potential values for new configuration settings. Formats such as integer 10, duration 10s, URI scheme://user:passwd@host:port may require quotation or other special handling when rendered in a template and written to a configuration file.
Edited by Mitchell Nielsen

Merge request reports