projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2535563
)
ssh: squeeze cleanup
author
Julien Cristau
<jcristau@debian.org>
Wed, 2 Mar 2016 22:31:33 +0000
(23:31 +0100)
committer
Julien Cristau
<jcristau@debian.org>
Wed, 2 Mar 2016 22:50:35 +0000
(23:50 +0100)
Signed-off-by: Julien Cristau <jcristau@debian.org>
modules/ssh/templates/sshd_config.erb
patch
|
blob
|
history
diff --git
a/modules/ssh/templates/sshd_config.erb
b/modules/ssh/templates/sshd_config.erb
index
947a254
..
6330a27
100644
(file)
--- a/
modules/ssh/templates/sshd_config.erb
+++ b/
modules/ssh/templates/sshd_config.erb
@@
-88,10
+88,7
@@
AcceptEnv LANG LC_*
Subsystem sftp /usr/lib/openssh/sftp-server
UsePAM yes
-<% if %w{squeeze}.include?(scope.lookupvar('::lsbdistcodename')) %>
-AuthorizedKeysFile /etc/ssh/userkeys/%u
-AuthorizedKeysFile2 /var/lib/misc/userkeys/%u
-<% else %>
+
AuthorizedKeysFile /etc/ssh/userkeys/%u /var/lib/misc/userkeys/%u /etc/ssh/userkeys/%u.more
-<% end %>
+
PasswordAuthentication no