add the variable sshd_authorized_keys_file with the default set to the normal: %h/.ssh/authorized_keys

This commit is contained in:
Micah Anderson 2008-09-26 20:03:10 -04:00
parent 26e4ac53a9
commit ef6f137cff
5 changed files with 31 additions and 5 deletions

View file

@ -83,6 +83,10 @@
#
# sshd_port: If you want to specify a different port than the default 22
# Default: 22
#
# sshd_authorized_keys_file: Set this to the location of the AuthorizedKeysFile (e.g. /etc/ssh/authorized_keys/%u)
# Default: AuthorizedKeysFile %h/.ssh/authorized_keys
#
class sshd {
include sshd::client
@ -165,7 +169,11 @@ class sshd::base {
'' => 22,
default => $sshd_port
}
$real_sshd_authorized_keys_file = $sshd_authorized_keys_file ? {
'' => "%h/.ssh/authorized_keys",
default => $sshd_authorized_keys_file
}
file { 'sshd_config':
path => '/etc/ssh/sshd_config',
owner => root,

View file

@ -66,7 +66,12 @@ PubkeyAuthentication yes
<%- else %>
PubkeyAuthentication no
<%- end %>
#AuthorizedKeysFile .ssh/authorized_keys
<%- unless real_sshd_authorized_keys_file.to_s.empty? then %>
AuthorizedKeysFile <%= real_sshd_authorized_keys_file %>
<%- else %>
AuthorizedKeysFile %h/.ssh/authorized_keys
<%- end %>
# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
<%- if real_sshd_rhosts_rsa_authentication.to_s == 'yes' then %>

View file

@ -57,7 +57,11 @@ PubkeyAuthentication yes
PubkeyAuthentication no
<%- end %>
#AuthorizedKeysFile %h/.ssh/authorized_keys
<%- unless real_sshd_authorized_keys_file.to_s.empty? then %>
AuthorizedKeysFile <%= real_sshd_authorized_keys_file %>
<%- else %>
AuthorizedKeysFile %h/.ssh/authorized_keys
<%- end %>
# For this to work you will also need host keys in /etc/ssh_known_hosts
<%- if real_sshd_rhosts_rsa_authentication.to_s == 'yes' then %>

View file

@ -69,7 +69,12 @@ PubkeyAuthentication yes
<%- else %>
PubkeyAuthentication no
<%- end %>
#AuthorizedKeysFile .ssh/authorized_keys
<%- unless real_sshd_authorized_keys_file.to_s.empty? then %>
AuthorizedKeysFile <%= real_sshd_authorized_keys_file %>
<%- else %>
AuthorizedKeysFile %h/.ssh/authorized_keys
<%- end %>
# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
<%- if real_sshd_rhosts_rsa_authentication.to_s == 'yes' then %>

View file

@ -63,7 +63,11 @@ PubkeyAuthentication yes
PubkeyAuthentication no
<%- end %>
#AuthorizedKeysFile .ssh/authorized_keys
<%- unless real_sshd_authorized_keys_file.to_s.empty? then %>
AuthorizedKeysFile <%= real_sshd_authorized_keys_file %>
<%- else %>
AuthorizedKeysFile %h/.ssh/authorized_keys
<%- end %>
# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
<%- if real_sshd_rhosts_rsa_authentication.to_s == 'yes' then %>