Ordering issues

This commit is contained in:
Matt Willsher 2014-12-22 09:41:32 +00:00
parent 26a0f5e350
commit b9261337be
3 changed files with 8 additions and 9 deletions

View file

@ -2,7 +2,6 @@
cat macros.j2 cat macros.j2
cat ssh_options | cat ssh_options |
sort |
awk '{ awk '{
print "{{ render_option(\""$1"\",sshd_"$1") -}}" print "{{ render_option(\""$1"\",sshd_"$1") -}}"
}' }'

View file

@ -1,3 +1,7 @@
Port
ListenAddress
Protocol
HostKey
AcceptEnv AcceptEnv
AddressFamily AddressFamily
AllowAgentForwarding AllowAgentForwarding
@ -28,7 +32,6 @@ GatewayPorts
HPNBufferSize HPNBufferSize
HPNDisabled HPNDisabled
HostCertificate HostCertificate
HostKey
HostKeyAgent HostKeyAgent
HostbasedAuthentication HostbasedAuthentication
HostbasedUsesNameFromPacketOnly HostbasedUsesNameFromPacketOnly
@ -42,7 +45,6 @@ KerberosOrLocalPasswd
KerberosTicketCleanup KerberosTicketCleanup
KexAlgorithms KexAlgorithms
KeyRegenerationInterval KeyRegenerationInterval
ListenAddress
LogLevel LogLevel
LoginGraceTime LoginGraceTime
MACs MACs
@ -58,10 +60,8 @@ PermitTTY
PermitTunnel PermitTunnel
PermitUserEnvironment PermitUserEnvironment
PidFile PidFile
Port
PrintLastLog PrintLastLog
PrintMotd PrintMotd
Protocol
PubkeyAuthentication PubkeyAuthentication
RSAAuthentication RSAAuthentication
RekeyLimit RekeyLimit

View file

@ -21,6 +21,10 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}
{{ render_option("Port",sshd_Port) -}}
{{ render_option("ListenAddress",sshd_ListenAddress) -}}
{{ render_option("Protocol",sshd_Protocol) -}}
{{ render_option("HostKey",sshd_HostKey) -}}
{{ render_option("AcceptEnv",sshd_AcceptEnv) -}} {{ render_option("AcceptEnv",sshd_AcceptEnv) -}}
{{ render_option("AddressFamily",sshd_AddressFamily) -}} {{ render_option("AddressFamily",sshd_AddressFamily) -}}
{{ render_option("AllowAgentForwarding",sshd_AllowAgentForwarding) -}} {{ render_option("AllowAgentForwarding",sshd_AllowAgentForwarding) -}}
@ -51,7 +55,6 @@
{{ render_option("HPNBufferSize",sshd_HPNBufferSize) -}} {{ render_option("HPNBufferSize",sshd_HPNBufferSize) -}}
{{ render_option("HPNDisabled",sshd_HPNDisabled) -}} {{ render_option("HPNDisabled",sshd_HPNDisabled) -}}
{{ render_option("HostCertificate",sshd_HostCertificate) -}} {{ render_option("HostCertificate",sshd_HostCertificate) -}}
{{ render_option("HostKey",sshd_HostKey) -}}
{{ render_option("HostKeyAgent",sshd_HostKeyAgent) -}} {{ render_option("HostKeyAgent",sshd_HostKeyAgent) -}}
{{ render_option("HostbasedAuthentication",sshd_HostbasedAuthentication) -}} {{ render_option("HostbasedAuthentication",sshd_HostbasedAuthentication) -}}
{{ render_option("HostbasedUsesNameFromPacketOnly",sshd_HostbasedUsesNameFromPacketOnly) -}} {{ render_option("HostbasedUsesNameFromPacketOnly",sshd_HostbasedUsesNameFromPacketOnly) -}}
@ -65,7 +68,6 @@
{{ render_option("KerberosTicketCleanup",sshd_KerberosTicketCleanup) -}} {{ render_option("KerberosTicketCleanup",sshd_KerberosTicketCleanup) -}}
{{ render_option("KexAlgorithms",sshd_KexAlgorithms) -}} {{ render_option("KexAlgorithms",sshd_KexAlgorithms) -}}
{{ render_option("KeyRegenerationInterval",sshd_KeyRegenerationInterval) -}} {{ render_option("KeyRegenerationInterval",sshd_KeyRegenerationInterval) -}}
{{ render_option("ListenAddress",sshd_ListenAddress) -}}
{{ render_option("LogLevel",sshd_LogLevel) -}} {{ render_option("LogLevel",sshd_LogLevel) -}}
{{ render_option("LoginGraceTime",sshd_LoginGraceTime) -}} {{ render_option("LoginGraceTime",sshd_LoginGraceTime) -}}
{{ render_option("MACs",sshd_MACs) -}} {{ render_option("MACs",sshd_MACs) -}}
@ -81,10 +83,8 @@
{{ render_option("PermitTunnel",sshd_PermitTunnel) -}} {{ render_option("PermitTunnel",sshd_PermitTunnel) -}}
{{ render_option("PermitUserEnvironment",sshd_PermitUserEnvironment) -}} {{ render_option("PermitUserEnvironment",sshd_PermitUserEnvironment) -}}
{{ render_option("PidFile",sshd_PidFile) -}} {{ render_option("PidFile",sshd_PidFile) -}}
{{ render_option("Port",sshd_Port) -}}
{{ render_option("PrintLastLog",sshd_PrintLastLog) -}} {{ render_option("PrintLastLog",sshd_PrintLastLog) -}}
{{ render_option("PrintMotd",sshd_PrintMotd) -}} {{ render_option("PrintMotd",sshd_PrintMotd) -}}
{{ render_option("Protocol",sshd_Protocol) -}}
{{ render_option("PubkeyAuthentication",sshd_PubkeyAuthentication) -}} {{ render_option("PubkeyAuthentication",sshd_PubkeyAuthentication) -}}
{{ render_option("RSAAuthentication",sshd_RSAAuthentication) -}} {{ render_option("RSAAuthentication",sshd_RSAAuthentication) -}}
{{ render_option("RekeyLimit",sshd_RekeyLimit) -}} {{ render_option("RekeyLimit",sshd_RekeyLimit) -}}