From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 13 Jul 2011 21:39:18 +0000 (-0300)
Subject: Merge branch 'master' of git://labs.riseup.net/shared-sshd
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=99928cd61e67836d39aad9e2b2ce8b06badf0f0b;p=puppet-sshd.git

Merge branch 'master' of git://labs.riseup.net/shared-sshd
---

99928cd61e67836d39aad9e2b2ce8b06badf0f0b
diff --cc manifests/init.pp
index bfefaab,e933a46..af25e9e
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@@ -89,17 -92,8 +92,17 @@@ class sshd 
    case $sshd_ensure_version {
      '': { $sshd_ensure_version = "present" }
    }
 +  case $sshd_print_motd {
 +    '': { $sshd_print_motd = "yes" }
 +  }
 +  case $sshd_shared_ip {
 +    '': { $sshd_shared_ip = "no" }
 +  }
 +  case $sshd_use_strong_ciphers {
 +    '': { $sshd_use_strong_ciphers = "no" }
 +  }
  
-   include sshd::client 
+   include sshd::client
  
    case $operatingsystem {
      gentoo: { include sshd::gentoo }
diff --cc templates/sshd_config/Debian_etch.erb
index 562b1ef,23559fc..93fefc2
--- a/templates/sshd_config/Debian_etch.erb
+++ b/templates/sshd_config/Debian_etch.erb
@@@ -174,10 -170,13 +170,15 @@@ AllowUsers <%= sshd_allowed_users -%
  AllowGroups <%= sshd_allowed_groups %>
  <%- end %>
  
 -PrintMotd no
 +<%- if sshd_print_motd.to_s == 'no' then -%>
 +  PrintMotd no
 +<%- 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 %>
diff --cc templates/sshd_config/Debian_lenny.erb
index 022d2d9,65befdc..0c551e5
--- a/templates/sshd_config/Debian_lenny.erb
+++ b/templates/sshd_config/Debian_lenny.erb
@@@ -181,10 -179,13 +179,15 @@@ AllowUsers <%= sshd_allowed_users -%
  AllowGroups <%= sshd_allowed_groups %>
  <%- end %>
  
 +<%- if sshd_print_motd.to_s == 'no' then -%>
  PrintMotd no
 +<%- 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 %>