From 2c34f03b12659c7641dc9938ed43337a725acaa8 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Wed, 2 Mar 2016 23:31:33 +0100 Subject: [PATCH] ssh: squeeze cleanup Signed-off-by: Julien Cristau --- modules/ssh/templates/sshd_config.erb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb index 947a25475..6330a27c4 100644 --- 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 -- 2.20.1