Merge branch 'jenkins-build-19' into 'master'
Auto-merge for build 19 See merge request puppet/confdroid_ssh!19
This commit is contained in:
@@ -9,13 +9,6 @@ Port <%= @ssh_fw_port %>
|
|||||||
AddressFamily <%= @ssh_address_family %>
|
AddressFamily <%= @ssh_address_family %>
|
||||||
ListenAddress <%= @ssh_listen_address %>
|
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 -%>
|
<% if @ssh_use_specific_hostkey -%>
|
||||||
HostKey /etc/ssh/ssh_host_<%= @ssh_hostkey_type %>_key
|
HostKey /etc/ssh/ssh_host_<%= @ssh_hostkey_type %>_key
|
||||||
<% end -%>
|
<% end -%>
|
||||||
@@ -28,4 +21,11 @@ LogLevel <%= @ssh_log_level %>
|
|||||||
PermitRootLogin <%= @ssh_root_login %>
|
PermitRootLogin <%= @ssh_root_login %>
|
||||||
StrictModes <%= @ssh_strict_modes %>
|
StrictModes <%= @ssh_strict_modes %>
|
||||||
MaxAuthTries <%= @ssh_max_auth_tries %>
|
MaxAuthTries <%= @ssh_max_auth_tries %>
|
||||||
MaxSessions <%= @ssh_max_sessions %>
|
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 %>
|
||||||
Reference in New Issue
Block a user