Skip to content

Commit 1f47150

Browse files
authored
feat: Add new options from OpenSSH 10.0 (#312)
* Add new options from OpenSSH 10.0 Signed-off-by: Jakub Jelen <jjelen@redhat.com> * tests: Install awk on new Fedora Signed-off-by: Jakub Jelen <jjelen@redhat.com> --------- Signed-off-by: Jakub Jelen <jjelen@redhat.com>
1 parent 4f2f0b0 commit 1f47150

File tree

5 files changed

+8
-2
lines changed

5 files changed

+8
-2
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
man-db
2+
gawk

meta/options_body

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ SecurityKeyProvider
106106
SetEnv
107107
ServerKeyBits
108108
ShowPatchLevel
109+
SshdAuthPath
109110
SshdSessionPath
110111
StreamLocalBindMask
111112
StreamLocalBindUnlink

templates/sshd_config.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ Match {{ match["Condition"] }}
232232
{{ body_option("SetEnv",sshd_SetEnv) -}}
233233
{{ body_option("ServerKeyBits",sshd_ServerKeyBits) -}}
234234
{{ body_option("ShowPatchLevel",sshd_ShowPatchLevel) -}}
235+
{{ body_option("SshdAuthPath",sshd_SshdAuthPath) -}}
235236
{{ body_option("SshdSessionPath",sshd_SshdSessionPath) -}}
236237
{{ body_option("StreamLocalBindMask",sshd_StreamLocalBindMask) -}}
237238
{{ body_option("StreamLocalBindUnlink",sshd_StreamLocalBindUnlink) -}}

templates/sshd_config_snippet.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ Match {{ match["Condition"] }}
230230
{{ body_option("SetEnv",sshd_SetEnv) -}}
231231
{{ body_option("ServerKeyBits",sshd_ServerKeyBits) -}}
232232
{{ body_option("ShowPatchLevel",sshd_ShowPatchLevel) -}}
233+
{{ body_option("SshdAuthPath",sshd_SshdAuthPath) -}}
233234
{{ body_option("SshdSessionPath",sshd_SshdSessionPath) -}}
234235
{{ body_option("StreamLocalBindMask",sshd_StreamLocalBindMask) -}}
235236
{{ body_option("StreamLocalBindUnlink",sshd_StreamLocalBindUnlink) -}}

tests/tests_all_options.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,23 +56,25 @@
5656
when:
5757
- ansible_facts['distribution'] == "Alpine"
5858

59-
- name: Make sure manual pages and bash are installed on RedHat 7+
59+
- name: Make sure manual pages, gawk and bash are installed on RedHat 7+
6060
ansible.builtin.package:
6161
name:
6262
- man-db
6363
- bash
64+
- gawk
6465
state: present
6566
use: "{{ (__sshd_is_ostree | d(false)) |
6667
ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
6768
when:
6869
- ansible_facts['os_family'] == "RedHat"
6970
- ansible_facts['distribution_major_version'] | int > 6
7071

71-
- name: Make sure manual pages and bash are installed elsewhere
72+
- name: Make sure manual pages, gawk and bash are installed elsewhere
7273
ansible.builtin.package:
7374
name:
7475
- man
7576
- bash
77+
- gawk
7678
state: present
7779
use: "{{ (__sshd_is_ostree | d(false)) |
7880
ternary('ansible.posix.rhel_rpm_ostree', omit) }}"

0 commit comments

Comments
 (0)