projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make this as safe as I can
[mirror/dsa-puppet.git]
/
modules
/
ssh
/
templates
/
sshd_config.erb
diff --git
a/modules/ssh/templates/sshd_config.erb
b/modules/ssh/templates/sshd_config.erb
index
0bc6efb
..
2d179de
100644
(file)
--- a/
modules/ssh/templates/sshd_config.erb
+++ b/
modules/ssh/templates/sshd_config.erb
@@
-5,7
+5,6
@@
Port 22
<%= extraports = case fqdn
when "ravel.debian.org" then "Port 443"
Port 22
<%= extraports = case fqdn
when "ravel.debian.org" then "Port 443"
- when "agnesi.debian.org" then "Port 2260"
end
extraports
%>
end
extraports
%>
@@
-76,10
+75,10
@@
AcceptEnv LANG LC_*
Subsystem sftp /usr/lib/openssh/sftp-server
UsePAM yes
Subsystem sftp /usr/lib/openssh/sftp-server
UsePAM yes
-<% if nodeinfo.has_key?('wheezy') and nodeinfo['wheezy'] %>
-AuthorizedKeysFile /etc/ssh/userkeys/%u /var/lib/misc/userkeys/%u
-<% else %>
+<% if %w{squeeze}.include?(scope.lookupvar('::lsbdistcodename')) %>
AuthorizedKeysFile /etc/ssh/userkeys/%u
AuthorizedKeysFile2 /var/lib/misc/userkeys/%u
AuthorizedKeysFile /etc/ssh/userkeys/%u
AuthorizedKeysFile2 /var/lib/misc/userkeys/%u
+<% else %>
+AuthorizedKeysFile /etc/ssh/userkeys/%u /var/lib/misc/userkeys/%u
<% end %>
PasswordAuthentication no
<% end %>
PasswordAuthentication no