X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fportforwarder%2Fmanifests%2Finit.pp;h=9cb62f60724bf3d45f2efc176744b3582896832f;hb=c46ff2155be94c3e1c3226879e13a8f31dbbac1b;hp=e5a59828fc0c29f4994bdf0d5d0d0252b248f18c;hpb=2bac5cd16d08f76d19b66c40d386009c24e87b76;p=mirror%2Fdsa-puppet.git

diff --git a/modules/portforwarder/manifests/init.pp b/modules/portforwarder/manifests/init.pp
index e5a59828f..9cb62f607 100644
--- 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'),