X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fssh%2Ftemplates%2Fsshd_config.erb;h=2d179de877109b8b9f2b510b827876bb418eb6fe;hb=93abfc265324e5efa7a6f71d6f96e1d57ae9577b;hp=93b39c5f374f617bb8afd3bf1aff0a45c0eb0bc7;hpb=d32e0db21b3189bc85385eb4a7af1835bd3769a9;p=dsa-puppet.git diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb index 93b39c5f..2d179de8 100644 --- 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" - when "agnesi.debian.org" then "Port 2260" end extraports %> @@ -76,7 +75,7 @@ AcceptEnv LANG LC_* Subsystem sftp /usr/lib/openssh/sftp-server UsePAM yes -<% if %w{lenny squeeze}.include?(lsbdistcodename) %> +<% if %w{squeeze}.include?(scope.lookupvar('::lsbdistcodename')) %> AuthorizedKeysFile /etc/ssh/userkeys/%u AuthorizedKeysFile2 /var/lib/misc/userkeys/%u <% else %>