opuppet/module-sshd
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Adding PrintMotd parameter to all templates and setting per-distro default value

Browse source
This commit is contained in:
Silvio Rhatto 2011-07-21 11:01:33 -03:00
parent 89aeace9b6
commit 0e9e1b6f2c
10 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
manifests/init.pp
View file

@ -93,7 +93,12 @@ class sshd {
'': { $sshd_ensure_version = "present" } '': { $sshd_ensure_version = "present" }
} }
case $sshd_print_motd { case $sshd_print_motd {
'': { $sshd_print_motd = "yes" } '': {
case $operatingsystem {
debian,ubuntu: { $sshd_print_motd = "no" }
default: { $sshd_print_motd = "yes" }
}
}
} }
case $sshd_shared_ip { case $sshd_shared_ip {
'': { $sshd_shared_ip = "no" } '': { $sshd_shared_ip = "no" }

2
templates/sshd_config/CentOS.erb
View file

@ -171,7 +171,7 @@ X11Forwarding no
<%- end -%> <%- end -%>
#X11DisplayOffset 10 #X11DisplayOffset 10
#X11UseLocalhost yes #X11UseLocalhost yes
#PrintMotd yes PrintMotd <%= sshd_print_motd %>
#PrintLastLog yes #PrintLastLog yes
#TCPKeepAlive yes #TCPKeepAlive yes
#UseLogin no #UseLogin no

4
templates/sshd_config/Debian_etch.erb
View file

@ -170,9 +170,7 @@ AllowUsers <%= sshd_allowed_users -%>
AllowGroups <%= sshd_allowed_groups %> AllowGroups <%= sshd_allowed_groups %>
<%- end %> <%- end %>
<%- if sshd_print_motd.to_s == 'no' then -%> PrintMotd <%= sshd_print_motd %>
PrintMotd no
<%- end -%>
<%- if sshd_hardened_ssl.to_s == 'yes' then -%> <%- if sshd_hardened_ssl.to_s == 'yes' then -%>
Ciphers aes256-ctr Ciphers aes256-ctr

4
templates/sshd_config/Debian_lenny.erb
View file

@ -179,9 +179,7 @@ AllowUsers <%= sshd_allowed_users -%>
AllowGroups <%= sshd_allowed_groups %> AllowGroups <%= sshd_allowed_groups %>
<%- end %> <%- end %>
<%- if sshd_print_motd.to_s == 'no' then -%> PrintMotd <%= sshd_print_motd %>
PrintMotd no
<%- end -%>
<%- if sshd_hardened_ssl.to_s == 'yes' then -%> <%- if sshd_hardened_ssl.to_s == 'yes' then -%>
Ciphers aes256-ctr Ciphers aes256-ctr

2
templates/sshd_config/Debian_sid.erb
View file

@ -145,7 +145,7 @@ X11Forwarding yes
X11Forwarding no X11Forwarding no
<%- end -%> <%- end -%>
X11DisplayOffset 10 X11DisplayOffset 10
PrintMotd no PrintMotd <%= sshd_print_motd %>
PrintLastLog yes PrintLastLog yes
TCPKeepAlive yes TCPKeepAlive yes

2
templates/sshd_config/Debian_squeeze.erb
View file

@ -145,7 +145,7 @@ X11Forwarding yes
X11Forwarding no X11Forwarding no
<%- end -%> <%- end -%>
X11DisplayOffset 10 X11DisplayOffset 10
PrintMotd no PrintMotd <%= sshd_print_motd %>
PrintLastLog yes PrintLastLog yes
TCPKeepAlive yes TCPKeepAlive yes

2
templates/sshd_config/FreeBSD.erb
View file

@ -193,7 +193,7 @@ X11Forwarding no
X11DisplayOffset 10 X11DisplayOffset 10
#X11UseLocalhost yes #X11UseLocalhost yes
#PrintMotd yes PrintMotd <%= sshd_print_motd %>
#PrintLastLog yes #PrintLastLog yes
TCPKeepAlive yes TCPKeepAlive yes
#UseLogin no #UseLogin no

2
templates/sshd_config/Gentoo.erb
View file

@ -171,7 +171,7 @@ X11Forwarding no
<%- end %> <%- end %>
#X11DisplayOffset 10 #X11DisplayOffset 10
#X11UseLocalhost yes #X11UseLocalhost yes
#PrintMotd yes PrintMotd <%= sshd_print_motd %>
#PrintLastLog yes #PrintLastLog yes
#TCPKeepAlive yes #TCPKeepAlive yes
#UseLogin no #UseLogin no

2
templates/sshd_config/OpenBSD.erb
View file

@ -147,7 +147,7 @@ X11Forwarding no
<%- end %> <%- end %>
#X11DisplayOffset 10 #X11DisplayOffset 10
#X11UseLocalhost yes #X11UseLocalhost yes
#PrintMotd yes PrintMotd <%= sshd_print_motd %>
#PrintLastLog yes #PrintLastLog yes
#TCPKeepAlive yes #TCPKeepAlive yes
#UseLogin no #UseLogin no

4
templates/sshd_config/Ubuntu_lucid.erb
View file

@ -180,9 +180,7 @@ AllowUsers <%= sshd_allowed_users -%>
AllowGroups <%= sshd_allowed_groups %> AllowGroups <%= sshd_allowed_groups %>
<%- end %> <%- end %>
<%- if sshd_print_motd.to_s == 'no' then -%> PrintMotd <%= sshd_print_motd %>
PrintMotd no
<%- end -%>
<%- unless sshd_tail_additional_options.to_s.empty? then %> <%- unless sshd_tail_additional_options.to_s.empty? then %>
<%= sshd_tail_additional_options %> <%= sshd_tail_additional_options %>