diff options
author | varac <varacanero@zeromail.org> | 2015-05-04 14:03:50 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2015-05-04 14:03:50 +0200 |
commit | 943dd94dfab1de9316a5ed4c0751b36a6c75447a (patch) | |
tree | ea8e120b7d7ef84ba71391f39870092e43391627 /templates/sshd_config/Ubuntu_lucid.erb | |
parent | 750a497758d94c2f5a6cad23cecc3dbde2d2f92f (diff) | |
parent | e9596d0f6d243ae00bb5b360a5c37bed577c5438 (diff) |
Merge remote-tracking branch 'shared/master' into leap_master
Conflicts:
templates/sshd_config/Debian_wheezy.erb
Diffstat (limited to 'templates/sshd_config/Ubuntu_lucid.erb')
-rw-r--r-- | templates/sshd_config/Ubuntu_lucid.erb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/templates/sshd_config/Ubuntu_lucid.erb b/templates/sshd_config/Ubuntu_lucid.erb index cc6e921..cff95a7 100644 --- a/templates/sshd_config/Ubuntu_lucid.erb +++ b/templates/sshd_config/Ubuntu_lucid.erb @@ -20,8 +20,10 @@ ListenAddress <%= address %> <% end -%> Protocol 2 # HostKeys for protocol version 2 -HostKey /etc/ssh/ssh_host_rsa_key -HostKey /etc/ssh/ssh_host_dsa_key +<% scope.lookupvar('sshd::hostkey_type').to_a.each do |hostkey_type| -%> +HostKey /etc/ssh/ssh_host_<%=hostkey_type %>_key +<% end -%> + #Privilege Separation is turned on for security UsePrivilegeSeparation yes |