Changing parameter name sshd_perfect_forward_secrecy to sshd_use_strong_ciphers as...

diff --git a/manifests/init.pp b/manifests/init.pp
index b4e478877fea162d652bc9373b8aec74cc16c885..bfefaab67ee2d4cef01e278aa5bfa959064f6be4 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -95,8 +95,8 @@ class sshd {
   case $sshd_shared_ip {
     '': { $sshd_shared_ip = "no" }
   }
-  case $sshd_perfect_forward_secrecy {
-    '': { $sshd_perfect_forward_secrecy = "no" }
+  case $sshd_use_strong_ciphers {
+    '': { $sshd_use_strong_ciphers = "no" }
   }
 
   include sshd::client 

diff --git a/templates/sshd_config/Debian_lenny.erb b/templates/sshd_config/Debian_lenny.erb
index ea04fe64df9dd4e66be7625368c77369e1cc8136..e85eab35332def838386bc91a403007a3b135417 100644 (file)
--- a/templates/sshd_config/Debian_lenny.erb
+++ b/templates/sshd_config/Debian_lenny.erb
@@ -189,7 +189,7 @@ PrintMotd no
 <%= sshd_tail_additional_options %>
 <%- end %>
 
-<%- if sshd_perfect_forward_secrecy.to_s == 'yes' then -%>
+<%- if sshd_use_strong_ciphers.to_s == 'yes' then -%>
 Ciphers aes256-ctr
 MACs hmac-sha1
 <%- end %>

diff --git a/templates/sshd_config/Debian_squeeze.erb b/templates/sshd_config/Debian_squeeze.erb
index 09f43511fe2bfaae3ca5244bfe76e4ef810ea5b1..38f865791dc96fd5d7cfcb64bec5825f63d013d8 100644 (file)
--- a/templates/sshd_config/Debian_squeeze.erb
+++ b/templates/sshd_config/Debian_squeeze.erb
@@ -203,7 +203,7 @@ AllowGroups <%= sshd_allowed_groups %>
 <%= sshd_tail_additional_options %>
 <%- end %>
 
-<%- if sshd_perfect_forward_secrecy.to_s == 'yes' then -%>
+<%- if sshd_use_strong_ciphers.to_s == 'yes' then -%>
 Ciphers aes256-ctr
 MACs hmac-sha1
 <%- end %>