diff options
| author | mh <mh@immerda.ch> | 2011-07-29 19:31:41 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-07-29 19:31:41 +0200 |
| commit | cb7cd9e314fad2cf8eb8d2c524e17a1c3e3e94d2 (patch) | |
| tree | 35ebac01729e545fae37083e5051f18aaa6c214b /templates/sshd_config/Debian_squeeze.erb | |
| parent | 7a44f28880a57814c26ed06c7d066c11a605cc70 (diff) | |
| parent | 0e9e1b6f2c5dca80c946f7944d47f1d28ba76920 (diff) | |
| download | puppet-sshd-cb7cd9e314fad2cf8eb8d2c524e17a1c3e3e94d2.tar.gz puppet-sshd-cb7cd9e314fad2cf8eb8d2c524e17a1c3e3e94d2.tar.bz2 | |
Merge remote-tracking branch 'shared/master'
Diffstat (limited to 'templates/sshd_config/Debian_squeeze.erb')
| -rw-r--r-- | templates/sshd_config/Debian_squeeze.erb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/templates/sshd_config/Debian_squeeze.erb b/templates/sshd_config/Debian_squeeze.erb index cf50ddb..fb58e72 100644 --- a/templates/sshd_config/Debian_squeeze.erb +++ b/templates/sshd_config/Debian_squeeze.erb @@ -145,7 +145,7 @@ X11Forwarding yes X11Forwarding no <%- end -%> X11DisplayOffset 10 -PrintMotd no +PrintMotd <%= sshd_print_motd %> PrintLastLog yes TCPKeepAlive yes @@ -197,6 +197,11 @@ AllowUsers <%= sshd_allowed_users -%> AllowGroups <%= sshd_allowed_groups %> <%- end %> +<%- if sshd_hardened_ssl.to_s == 'yes' then -%> +Ciphers aes256-ctr +MACs hmac-sha1 +<%- end -%> + <%- unless sshd_tail_additional_options.to_s.empty? then %> <%= sshd_tail_additional_options %> <%- end %> |