Merge pull request #305 from ghoneycutt/fix_match_config

Make sure Match-configuration is at the bottom
This commit is contained in:
Garrett Honeycutt 2019-02-28 15:41:01 -05:00 committed by GitHub
commit 89d451b976
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -264,15 +264,6 @@ AllowGroups <%= @sshd_config_allowgroups_real.join(' ') %>
<% if @sshd_config_key_revocation_list_real -%> <% if @sshd_config_key_revocation_list_real -%>
RevokedKeys <%= @sshd_config_key_revocation_list_real %> RevokedKeys <%= @sshd_config_key_revocation_list_real %>
<% end -%> <% end -%>
<% if @sshd_config_match -%>
<% @sshd_config_match.sort.each do |key, hash| -%>
Match <%= key %>
<% hash.sort.each do |values| -%>
<%= values %>
<% end -%>
<% end -%>
<% end -%>
<% if @sshd_config_hostcertificate_real.class == Array -%> <% if @sshd_config_hostcertificate_real.class == Array -%>
<% @sshd_config_hostcertificate_real.each do |cert| -%> <% @sshd_config_hostcertificate_real.each do |cert| -%>
HostCertificate <%= cert %> HostCertificate <%= cert %>
@ -286,3 +277,12 @@ TrustedUserCAKeys <%= @sshd_config_trustedusercakeys_real %>
<% if @sshd_config_authorized_principals_file_real -%> <% if @sshd_config_authorized_principals_file_real -%>
AuthorizedPrincipalsFile <%= @sshd_config_authorized_principals_file_real %> AuthorizedPrincipalsFile <%= @sshd_config_authorized_principals_file_real %>
<% end -%> <% end -%>
<% if @sshd_config_match -%>
<% @sshd_config_match.sort.each do |key, hash| -%>
Match <%= key %>
<% hash.sort.each do |values| -%>
<%= values %>
<% end -%>
<% end -%>
<% end -%>