From b9261337be4decbb1ab9a4d96569cf00521cf0ce Mon Sep 17 00:00:00 2001
From: Matt Willsher <matt@willsher.systems>
Date: Mon, 22 Dec 2014 09:41:32 +0000
Subject: [PATCH] Ordering issues

---
 meta/make_option_list    | 1 -
 meta/ssh_options         | 8 ++++----
 templates/sshd_config.j2 | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/meta/make_option_list b/meta/make_option_list
index 2ff821f..5115b13 100755
--- a/meta/make_option_list
+++ b/meta/make_option_list
@@ -2,7 +2,6 @@
 cat macros.j2
 
 cat ssh_options |
-  sort |
   awk '{
 print "{{ render_option(\""$1"\",sshd_"$1") -}}"
 }'
diff --git a/meta/ssh_options b/meta/ssh_options
index 30b46c8..bf37eb2 100644
--- a/meta/ssh_options
+++ b/meta/ssh_options
@@ -1,3 +1,7 @@
+Port
+ListenAddress
+Protocol
+HostKey
 AcceptEnv
 AddressFamily
 AllowAgentForwarding
@@ -28,7 +32,6 @@ GatewayPorts
 HPNBufferSize
 HPNDisabled
 HostCertificate
-HostKey
 HostKeyAgent
 HostbasedAuthentication
 HostbasedUsesNameFromPacketOnly
@@ -42,7 +45,6 @@ KerberosOrLocalPasswd
 KerberosTicketCleanup
 KexAlgorithms
 KeyRegenerationInterval
-ListenAddress
 LogLevel
 LoginGraceTime
 MACs
@@ -58,10 +60,8 @@ PermitTTY
 PermitTunnel
 PermitUserEnvironment
 PidFile
-Port
 PrintLastLog
 PrintMotd
-Protocol
 PubkeyAuthentication
 RSAAuthentication
 RekeyLimit
diff --git a/templates/sshd_config.j2 b/templates/sshd_config.j2
index e6bbbe6..3f17ff4 100644
--- a/templates/sshd_config.j2
+++ b/templates/sshd_config.j2
@@ -21,6 +21,10 @@
 {%     endif %}
 {%   endif %}
 {% 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("AddressFamily",sshd_AddressFamily) -}}
 {{ render_option("AllowAgentForwarding",sshd_AllowAgentForwarding) -}}
@@ -51,7 +55,6 @@
 {{ render_option("HPNBufferSize",sshd_HPNBufferSize) -}}
 {{ render_option("HPNDisabled",sshd_HPNDisabled) -}}
 {{ render_option("HostCertificate",sshd_HostCertificate) -}}
-{{ render_option("HostKey",sshd_HostKey) -}}
 {{ render_option("HostKeyAgent",sshd_HostKeyAgent) -}}
 {{ render_option("HostbasedAuthentication",sshd_HostbasedAuthentication) -}}
 {{ render_option("HostbasedUsesNameFromPacketOnly",sshd_HostbasedUsesNameFromPacketOnly) -}}
@@ -65,7 +68,6 @@
 {{ render_option("KerberosTicketCleanup",sshd_KerberosTicketCleanup) -}}
 {{ render_option("KexAlgorithms",sshd_KexAlgorithms) -}}
 {{ render_option("KeyRegenerationInterval",sshd_KeyRegenerationInterval) -}}
-{{ render_option("ListenAddress",sshd_ListenAddress) -}}
 {{ render_option("LogLevel",sshd_LogLevel) -}}
 {{ render_option("LoginGraceTime",sshd_LoginGraceTime) -}}
 {{ render_option("MACs",sshd_MACs) -}}
@@ -81,10 +83,8 @@
 {{ render_option("PermitTunnel",sshd_PermitTunnel) -}}
 {{ render_option("PermitUserEnvironment",sshd_PermitUserEnvironment) -}}
 {{ render_option("PidFile",sshd_PidFile) -}}
-{{ render_option("Port",sshd_Port) -}}
 {{ render_option("PrintLastLog",sshd_PrintLastLog) -}}
 {{ render_option("PrintMotd",sshd_PrintMotd) -}}
-{{ render_option("Protocol",sshd_Protocol) -}}
 {{ render_option("PubkeyAuthentication",sshd_PubkeyAuthentication) -}}
 {{ render_option("RSAAuthentication",sshd_RSAAuthentication) -}}
 {{ render_option("RekeyLimit",sshd_RekeyLimit) -}}