From: Stephen Gran <steve@lobefin.net>
Date: Sun, 9 Oct 2011 19:45:52 +0000 (+0100)
Subject: and we need this now
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=3748ea9639537d06563ae9f7d57e187088a767e2;p=mirror%2Fdsa-puppet.git

and we need this now

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb
index 6cf1f9cc1..0bc6efb7d 100644
--- 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