Merge branch 'jenkins-build-18' into 'master'

Auto-merge for build 18

See merge request puppet/confdroid_ssh!18

templates/sshd_custom_conf.erb

@@ -9,6 +9,13 @@ Port <%= @ssh_fw_port %>
 AddressFamily <%= @ssh_address_family %>
 ListenAddress <%= @ssh_listen_address %> 
 
+PubkeyAuthentication <%= @ssh_pubkey_auth %>
+AuthorizedKeysFile	<%= @ssh_auth_key_files %>
+
+AuthorizedPrincipalsFile <%= @ssh_authorized_principals_file %>
+AuthorizedKeysCommand <%= @ssh_authorized_keys_command %>
+AuthorizedKeysCommandUser <%= @ssh_authorized_keys_command_user %>
+
 <% if @ssh_use_specific_hostkey -%>
 HostKey /etc/ssh/ssh_host_<%= @ssh_hostkey_type %>_key
 <% end -%>
@@ -21,11 +28,4 @@ LogLevel <%= @ssh_log_level %>
 PermitRootLogin <%= @ssh_root_login %>
 StrictModes <%= @ssh_strict_modes %>
 MaxAuthTries <%= @ssh_max_auth_tries %>
-MaxSessions <%= @ssh_max_sessions %>
-
-PubkeyAuthentication <%= @ssh_pubkey_auth %>
-AuthorizedKeysFile	<%= @ssh_auth_key_files %>
-
-AuthorizedPrincipalsFile <%= @ssh_authorized_principals_file %>
-AuthorizedKeysCommand <%= @ssh_authorized_keys_command %>
-AuthorizedKeysCommandUser <%= @ssh_authorized_keys_command_user %>
+MaxSessions <%= @ssh_max_sessions %>