libretic/ansible-sshd
6
0
Fork 0
mirror of https://github.com/willshersystems/ansible-sshd synced 2024-11-25 20:40:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add new configuration options from OpenSSH 9.8

Browse source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Jakub Jelen 2024-08-17 09:57:44 +02:00 committed by Jakub Jelen
parent 7c588042c7
commit 4478b2bbe0
5 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -486,4 +486,4 @@ Matt Willsher <matt@willsher.systems>
Jakub Jelen <jjelen@redhat.com> Jakub Jelen <jjelen@redhat.com>
&copy; 2020 - 2022 Red Hat, Inc. &copy; 2020 - 2024 Red Hat, Inc.

4
meta/options_body
View file

@ -73,6 +73,7 @@ MaxSessions
MaxStartups MaxStartups
ModuliFile ModuliFile
NoneEnabled NoneEnabled
PAMServiceName
PasswordAuthentication PasswordAuthentication
PermitEmptyPasswords PermitEmptyPasswords
PermitListen PermitListen
@ -82,6 +83,8 @@ PermitTTY
PermitTunnel PermitTunnel
PermitUserEnvironment PermitUserEnvironment
PermitUserRC PermitUserRC
PerSourcePenalties
PerSourcePenaltyExemptList
PerSourceMaxStartups PerSourceMaxStartups
PerSourceNetBlockSize PerSourceNetBlockSize
PidFile PidFile
@ -102,6 +105,7 @@ SecurityKeyProvider
SetEnv SetEnv
ServerKeyBits ServerKeyBits
ShowPatchLevel ShowPatchLevel
SshdSessionPath
StreamLocalBindMask StreamLocalBindMask
StreamLocalBindUnlink StreamLocalBindUnlink
StrictModes StrictModes

1
meta/options_match
View file

@ -36,6 +36,7 @@ KerberosAuthentication
LogLevel LogLevel
MaxAuthTries MaxAuthTries
MaxSessions MaxSessions
PAMServiceName
PasswordAuthentication PasswordAuthentication
PermitEmptyPasswords PermitEmptyPasswords
PermitListen PermitListen

5
templates/sshd_config.j2
View file

@ -82,6 +82,7 @@ Match {{ match["Condition"] }}
{{ render_option("LogLevel",match["LogLevel"],true) -}} {{ render_option("LogLevel",match["LogLevel"],true) -}}
{{ render_option("MaxAuthTries",match["MaxAuthTries"],true) -}} {{ render_option("MaxAuthTries",match["MaxAuthTries"],true) -}}
{{ render_option("MaxSessions",match["MaxSessions"],true) -}} {{ render_option("MaxSessions",match["MaxSessions"],true) -}}
{{ render_option("PAMServiceName",match["PAMServiceName"],true) -}}
{{ render_option("PasswordAuthentication",match["PasswordAuthentication"],true) -}} {{ render_option("PasswordAuthentication",match["PasswordAuthentication"],true) -}}
{{ render_option("PermitEmptyPasswords",match["PermitEmptyPasswords"],true) -}} {{ render_option("PermitEmptyPasswords",match["PermitEmptyPasswords"],true) -}}
{{ render_option("PermitListen",match["PermitListen"],true) -}} {{ render_option("PermitListen",match["PermitListen"],true) -}}
@ -197,6 +198,7 @@ Match {{ match["Condition"] }}
{{ body_option("MaxStartups",sshd_MaxStartups) -}} {{ body_option("MaxStartups",sshd_MaxStartups) -}}
{{ body_option("ModuliFile",sshd_ModuliFile) -}} {{ body_option("ModuliFile",sshd_ModuliFile) -}}
{{ body_option("NoneEnabled",sshd_NoneEnabled) -}} {{ body_option("NoneEnabled",sshd_NoneEnabled) -}}
{{ body_option("PAMServiceName",sshd_PAMServiceName) -}}
{{ body_option("PasswordAuthentication",sshd_PasswordAuthentication) -}} {{ body_option("PasswordAuthentication",sshd_PasswordAuthentication) -}}
{{ body_option("PermitEmptyPasswords",sshd_PermitEmptyPasswords) -}} {{ body_option("PermitEmptyPasswords",sshd_PermitEmptyPasswords) -}}
{{ body_option("PermitListen",sshd_PermitListen) -}} {{ body_option("PermitListen",sshd_PermitListen) -}}
@ -206,6 +208,8 @@ Match {{ match["Condition"] }}
{{ body_option("PermitTunnel",sshd_PermitTunnel) -}} {{ body_option("PermitTunnel",sshd_PermitTunnel) -}}
{{ body_option("PermitUserEnvironment",sshd_PermitUserEnvironment) -}} {{ body_option("PermitUserEnvironment",sshd_PermitUserEnvironment) -}}
{{ body_option("PermitUserRC",sshd_PermitUserRC) -}} {{ body_option("PermitUserRC",sshd_PermitUserRC) -}}
{{ body_option("PerSourcePenalties",sshd_PerSourcePenalties) -}}
{{ body_option("PerSourcePenaltyExemptList",sshd_PerSourcePenaltyExemptList) -}}
{{ body_option("PerSourceMaxStartups",sshd_PerSourceMaxStartups) -}} {{ body_option("PerSourceMaxStartups",sshd_PerSourceMaxStartups) -}}
{{ body_option("PerSourceNetBlockSize",sshd_PerSourceNetBlockSize) -}} {{ body_option("PerSourceNetBlockSize",sshd_PerSourceNetBlockSize) -}}
{{ body_option("PidFile",sshd_PidFile) -}} {{ body_option("PidFile",sshd_PidFile) -}}
@ -226,6 +230,7 @@ Match {{ match["Condition"] }}
{{ body_option("SetEnv",sshd_SetEnv) -}} {{ body_option("SetEnv",sshd_SetEnv) -}}
{{ body_option("ServerKeyBits",sshd_ServerKeyBits) -}} {{ body_option("ServerKeyBits",sshd_ServerKeyBits) -}}
{{ body_option("ShowPatchLevel",sshd_ShowPatchLevel) -}} {{ body_option("ShowPatchLevel",sshd_ShowPatchLevel) -}}
{{ body_option("SshdSessionPath",sshd_SshdSessionPath) -}}
{{ body_option("StreamLocalBindMask",sshd_StreamLocalBindMask) -}} {{ body_option("StreamLocalBindMask",sshd_StreamLocalBindMask) -}}
{{ body_option("StreamLocalBindUnlink",sshd_StreamLocalBindUnlink) -}} {{ body_option("StreamLocalBindUnlink",sshd_StreamLocalBindUnlink) -}}
{{ body_option("StrictModes",sshd_StrictModes) -}} {{ body_option("StrictModes",sshd_StrictModes) -}}

5
templates/sshd_config_snippet.j2
View file

@ -80,6 +80,7 @@ Match {{ match["Condition"] }}
{{ render_option("LogLevel",match["LogLevel"],true) -}} {{ render_option("LogLevel",match["LogLevel"],true) -}}
{{ render_option("MaxAuthTries",match["MaxAuthTries"],true) -}} {{ render_option("MaxAuthTries",match["MaxAuthTries"],true) -}}
{{ render_option("MaxSessions",match["MaxSessions"],true) -}} {{ render_option("MaxSessions",match["MaxSessions"],true) -}}
{{ render_option("PAMServiceName",match["PAMServiceName"],true) -}}
{{ render_option("PasswordAuthentication",match["PasswordAuthentication"],true) -}} {{ render_option("PasswordAuthentication",match["PasswordAuthentication"],true) -}}
{{ render_option("PermitEmptyPasswords",match["PermitEmptyPasswords"],true) -}} {{ render_option("PermitEmptyPasswords",match["PermitEmptyPasswords"],true) -}}
{{ render_option("PermitListen",match["PermitListen"],true) -}} {{ render_option("PermitListen",match["PermitListen"],true) -}}
@ -195,6 +196,7 @@ Match {{ match["Condition"] }}
{{ body_option("MaxStartups",sshd_MaxStartups) -}} {{ body_option("MaxStartups",sshd_MaxStartups) -}}
{{ body_option("ModuliFile",sshd_ModuliFile) -}} {{ body_option("ModuliFile",sshd_ModuliFile) -}}
{{ body_option("NoneEnabled",sshd_NoneEnabled) -}} {{ body_option("NoneEnabled",sshd_NoneEnabled) -}}
{{ body_option("PAMServiceName",sshd_PAMServiceName) -}}
{{ body_option("PasswordAuthentication",sshd_PasswordAuthentication) -}} {{ body_option("PasswordAuthentication",sshd_PasswordAuthentication) -}}
{{ body_option("PermitEmptyPasswords",sshd_PermitEmptyPasswords) -}} {{ body_option("PermitEmptyPasswords",sshd_PermitEmptyPasswords) -}}
{{ body_option("PermitListen",sshd_PermitListen) -}} {{ body_option("PermitListen",sshd_PermitListen) -}}
@ -204,6 +206,8 @@ Match {{ match["Condition"] }}
{{ body_option("PermitTunnel",sshd_PermitTunnel) -}} {{ body_option("PermitTunnel",sshd_PermitTunnel) -}}
{{ body_option("PermitUserEnvironment",sshd_PermitUserEnvironment) -}} {{ body_option("PermitUserEnvironment",sshd_PermitUserEnvironment) -}}
{{ body_option("PermitUserRC",sshd_PermitUserRC) -}} {{ body_option("PermitUserRC",sshd_PermitUserRC) -}}
{{ body_option("PerSourcePenalties",sshd_PerSourcePenalties) -}}
{{ body_option("PerSourcePenaltyExemptList",sshd_PerSourcePenaltyExemptList) -}}
{{ body_option("PerSourceMaxStartups",sshd_PerSourceMaxStartups) -}} {{ body_option("PerSourceMaxStartups",sshd_PerSourceMaxStartups) -}}
{{ body_option("PerSourceNetBlockSize",sshd_PerSourceNetBlockSize) -}} {{ body_option("PerSourceNetBlockSize",sshd_PerSourceNetBlockSize) -}}
{{ body_option("PidFile",sshd_PidFile) -}} {{ body_option("PidFile",sshd_PidFile) -}}
@ -224,6 +228,7 @@ Match {{ match["Condition"] }}
{{ body_option("SetEnv",sshd_SetEnv) -}} {{ body_option("SetEnv",sshd_SetEnv) -}}
{{ body_option("ServerKeyBits",sshd_ServerKeyBits) -}} {{ body_option("ServerKeyBits",sshd_ServerKeyBits) -}}
{{ body_option("ShowPatchLevel",sshd_ShowPatchLevel) -}} {{ body_option("ShowPatchLevel",sshd_ShowPatchLevel) -}}
{{ body_option("SshdSessionPath",sshd_SshdSessionPath) -}}
{{ body_option("StreamLocalBindMask",sshd_StreamLocalBindMask) -}} {{ body_option("StreamLocalBindMask",sshd_StreamLocalBindMask) -}}
{{ body_option("StreamLocalBindUnlink",sshd_StreamLocalBindUnlink) -}} {{ body_option("StreamLocalBindUnlink",sshd_StreamLocalBindUnlink) -}}
{{ body_option("StrictModes",sshd_StrictModes) -}} {{ body_option("StrictModes",sshd_StrictModes) -}}