diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-07-13 18:39:18 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-07-13 18:39:18 -0300 |
| commit | 99928cd61e67836d39aad9e2b2ce8b06badf0f0b (patch) | |
| tree | 0900294971db6f5781a99424ff9842291b700b8f /templates/sshd_config/Debian_squeeze.erb | |
| parent | 4d73d3784e074b719ef43efe152cb7d38ce24c7e (diff) | |
| parent | 779d27e0ae3e5430d11ea5b3084893c16466b5c0 (diff) | |
| download | puppet-sshd-99928cd61e67836d39aad9e2b2ce8b06badf0f0b.tar.gz puppet-sshd-99928cd61e67836d39aad9e2b2ce8b06badf0f0b.tar.bz2 | |
Merge branch 'master' of git://labs.riseup.net/shared-sshd
Diffstat (limited to 'templates/sshd_config/Debian_squeeze.erb')
| -rw-r--r-- | templates/sshd_config/Debian_squeeze.erb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/templates/sshd_config/Debian_squeeze.erb b/templates/sshd_config/Debian_squeeze.erb index 53175dd..1f92112 100644 --- a/templates/sshd_config/Debian_squeeze.erb +++ b/templates/sshd_config/Debian_squeeze.erb @@ -178,8 +178,6 @@ UsePAM yes UsePAM no <%- end -%> -HostbasedUsesNameFromPacketOnly yes - <%- if sshd_tcp_forwarding.to_s == 'yes' then -%> AllowTcpForwarding yes <%- else -%> @@ -199,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 %> |