From 1f25b213e1ff1c953dac53f02d862612a5e09c0f Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 27 Oct 2008 15:45:11 -0400 Subject: Debian's sshd config typically has PrintMotd no set because its already printed via PAM. Without it set, it is defaulted to 'yes', which results in the MOTD being printed twice, so we return the Debian default configuration in this commit --- templates/sshd_config/Debian_etch.erb | 2 +- templates/sshd_config/Debian_lenny.erb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/sshd_config/Debian_etch.erb b/templates/sshd_config/Debian_etch.erb index 28aa52c..f30242d 100644 --- a/templates/sshd_config/Debian_etch.erb +++ b/templates/sshd_config/Debian_etch.erb @@ -168,9 +168,9 @@ AllowUsers <%= sshd_allowed_users -%> AllowGroups <%= sshd_allowed_groups %> <%- end %> +PrintMotd no <%- unless sshd_additional_options.to_s.empty? then %> <%= sshd_additional_options %> <%- end %> - diff --git a/templates/sshd_config/Debian_lenny.erb b/templates/sshd_config/Debian_lenny.erb index 8d68808..146e664 100644 --- a/templates/sshd_config/Debian_lenny.erb +++ b/templates/sshd_config/Debian_lenny.erb @@ -174,6 +174,7 @@ AllowUsers <%= sshd_allowed_users -%> AllowGroups <%= sshd_allowed_groups %> <%- end %> +PrintMotd no <%- unless sshd_additional_options.to_s.empty? then %> <%= sshd_additional_options %> -- cgit v1.2.3