PrintMotd using default OpenSSH setting

diff --git a/manifests/init.pp b/manifests/init.pp
index ead475d94d3c4bb3e7fb7ccba6322ac375bf9ed1..ba48b8cf5dbeb563d3eb3d45dd1a1801ab7d3ac1 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -211,6 +211,9 @@ class sshd {
   case $sshd_ensure_version {
     '': { $sshd_ensure_version = "present" }
   }
+  case $sshd_print_motd {
+    '': { $sshd_print_motd = "yes" }
+  }
 
   include sshd::client 
 

diff --git a/templates/sshd_config/Debian_etch.erb b/templates/sshd_config/Debian_etch.erb
index 746a447ef2b6db67145cff24459bacebf592b844..7a38cc42c0b932f70f05f88f09e1484c8a370fc2 100644 (file)
--- a/templates/sshd_config/Debian_etch.erb
+++ b/templates/sshd_config/Debian_etch.erb
@@ -176,7 +176,9 @@ AllowUsers <%= sshd_allowed_users -%>
 AllowGroups <%= sshd_allowed_groups %>
 <%- end %>
 
-PrintMotd no
+<%- if sshd_print_motd.to_s == 'no' then -%>
+  PrintMotd no
+<%- end -%>
 
 <%- unless sshd_tail_additional_options.to_s.empty? then %>
 <%= sshd_tail_additional_options %>

diff --git a/templates/sshd_config/Debian_lenny.erb b/templates/sshd_config/Debian_lenny.erb
index 18f3e4d5cdf9e2ea5ba9ae46e12778ba12ad46e6..5f7afb481bb2ad583bb155ff7114a91be2a5dc29 100644 (file)
--- a/templates/sshd_config/Debian_lenny.erb
+++ b/templates/sshd_config/Debian_lenny.erb
@@ -182,7 +182,9 @@ AllowUsers <%= sshd_allowed_users -%>
 AllowGroups <%= sshd_allowed_groups %>
 <%- end %>
 
+<%- if sshd_print_motd.to_s == 'no' then -%>
 PrintMotd no
+<%- end -%>
 
 <%- unless sshd_tail_additional_options.to_s.empty? then %>
 <%= sshd_tail_additional_options %>