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:
7c3664b
)
and we need this now
author
Stephen Gran
<steve@lobefin.net>
Sun, 9 Oct 2011 19:45:52 +0000
(20:45 +0100)
committer
Stephen Gran
<steve@lobefin.net>
Sun, 9 Oct 2011 19:45:52 +0000
(20:45 +0100)
Signed-off-by: Stephen Gran <steve@lobefin.net>
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
6cf1f9c
..
0bc6efb
100644
(file)
--- a/
modules/ssh/templates/sshd_config.erb
+++ b/
modules/ssh/templates/sshd_config.erb
@@
-76,6
+76,10
@@
AcceptEnv LANG LC_*
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 %>
AuthorizedKeysFile /etc/ssh/userkeys/%u
AuthorizedKeysFile2 /var/lib/misc/userkeys/%u
+<% end %>
PasswordAuthentication no