From 68b72b545bba4e1dfdfff8977955de9b0291cf87 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 2 Oct 2008 22:04:31 +0000 Subject: remove deprecated define git-svn-id: https://svn/ipuppet/trunk/modules/sshd@2317 d66ca3ae-40d7-4aa7-90d4-87d79ca94279 --- manifests/init.pp | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) (limited to 'manifests') diff --git a/manifests/init.pp b/manifests/init.pp index a7106b4..21c21c6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,7 +13,7 @@ # the Free Software Foundation. # # Deploy authorized_keys file with the define -# sshd::deploy_auth_key +# sshd::ssh_authorized_key # # sshd-config: # @@ -293,43 +293,3 @@ define sshd::ssh_authorized_key( } } } - -# deprecated! -define sshd::deploy_auth_key( - $source = 'present', - $user = 'root', - $target_dir = '/root/.ssh/', - $group = 0 ) { - - notice("this way of deploying authorized keys is deprecated. use the native ssh_authorized_key instead") - - $real_target = $target_dir ? { - '' => "/home/$user/.ssh/", - default => $target_dir, - } - - file {$real_target: - ensure => directory, - owner => $user, - group => $group, - mode => 700, - } - - case $source { - 'present': { $keysource = $name } - default: { $keysource = $source } - } - - file {"authorized_keys_${user}": - path => "$real_target/authorized_keys", - owner => $user, - group => $group, - mode => 600, - source => [ "puppet://$server/files/sshd/authorized_keys/${keysource}", - "puppet://$server/files/sshd/authorized_keys/${fqdn}", - "puppet://$server/files/sshd/authorized_keys/default", - "puppet://$server/sshd/authorized_keys/${name}", - "puppet://$server/sshd/authorized_keys/${fqdn}", - "puppet://$server/sshd/authorized_keys/default" ], - } -} -- cgit v1.2.3