X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fssh_upload.pp;h=49b9797c9e677b4b93e53cf653b7473b799783e5;hb=b806aff721e2e0bb17c52b7df5c3eb889ac1abc6;hp=07a6eb85a3417a1e055d5d548121064fdc9cdae4;hpb=6a94b204599f27a5ec786e03242b594fb51bc7fc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ssh_upload.pp b/modules/roles/manifests/ssh_upload.pp
index 07a6eb85a..49b9797c9 100644
--- a/modules/roles/manifests/ssh_upload.pp
+++ b/modules/roles/manifests/ssh_upload.pp
@@ -1,10 +1,11 @@
 class roles::ssh_upload {
-	file { '/etc/ssh/userkeys/buildd-uploader':
-		content => template('roles/ssh_upload_buildd-uploader-authorized_keys.erb'),
-	}
+  ssh::authorized_key_collect { 'buildd-uploader':
+    target_user => 'buildd-uploader',
+    collect_tag => 'buildd_upload',
+  }
 
-	file { '/home/buildd-uploader/rsync-ssh-wrap':
-		source => 'puppet:///modules/roles/ssh_upload/rsync-ssh-wrap',
-		mode   => '0555',
-	}
+  file { '/home/buildd-uploader/rsync-ssh-wrap':
+    source => 'puppet:///modules/roles/ssh_upload/rsync-ssh-wrap',
+    mode   => '0555',
+  }
 }