switch ssh-keygens to ssh::keygen

[mirror/dsa-puppet.git] / modules / portforwarder / manifests / init.pp

diff --git a/modules/portforwarder/manifests/init.pp b/modules/portforwarder/manifests/init.pp
index e5a5982..9cb62f6 100644 (file)
--- a/modules/portforwarder/manifests/init.pp
+++ b/modules/portforwarder/manifests/init.pp
@@ -3,12 +3,7 @@ class portforwarder {
        # for now this will have to be done manually
 
        if $::portforwarder_user_exists {
-               if ! $::portforwarder_key {
-                       exec { 'create-portforwarder-key':
-                               command => '/bin/su - portforwarder -c \'mkdir -p -m 02700 .ssh && ssh-keygen -C "`whoami`@`hostname` (`date +%Y-%m-%d`)" -P "" -f .ssh/id_rsa -q\'',
-                               onlyif  => '/usr/bin/getent passwd portforwarder > /dev/null && ! [ -e /home/portforwarder/.ssh/id_rsa ]'
-                       }
-               }
+               ssh::keygen {'portforwarder': }
 
                file { '/etc/ssh/userkeys/portforwarder':
                        content => template('portforwarder/authorized_keys.erb'),