diff options
| author | Micah Anderson <micah@riseup.net> | 2008-10-27 15:45:11 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2008-10-27 15:45:11 -0400 |
| commit | 1f25b213e1ff1c953dac53f02d862612a5e09c0f (patch) | |
| tree | 7ffeb68ee727e8dfb776dc1c66b6f694e1d32321 | |
| parent | 98ddbe8ef56d5a3552e4dd812d1a01cbae211eaf (diff) | |
| download | puppet-sshd-1f25b213e1ff1c953dac53f02d862612a5e09c0f.tar.gz puppet-sshd-1f25b213e1ff1c953dac53f02d862612a5e09c0f.tar.bz2 | |
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
| -rw-r--r-- | templates/sshd_config/Debian_etch.erb | 2 | ||||
| -rw-r--r-- | templates/sshd_config/Debian_lenny.erb | 1 |
2 files changed, 2 insertions, 1 deletions
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 %> |