X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fbuildd_master.pp;h=c2c8dd60eb0f2f3ba84c6ec11096914ca619f3e7;hb=1a22a9a4b1d7bb3c8bd1fc9041a5edf37b93232d;hp=03d06f8e5501f9152d665fb14600793d5dd3e3be;hpb=1392f670477c70f0d2128776791c4dd77d063870;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/buildd_master.pp b/modules/roles/manifests/buildd_master.pp
index 03d06f8e5..c2c8dd60e 100644
--- a/modules/roles/manifests/buildd_master.pp
+++ b/modules/roles/manifests/buildd_master.pp
@@ -1,9 +1,14 @@
 class roles::buildd_master {
-	ssl::service { 'buildd.debian.org':
-		notify => Service['apache2'],
-	}
+  include apache2
+  include roles::sso_rp
 
-	file { '/etc/ssh/userkeys/wb-buildd.more':
-		content => template('roles/buildd_master_wb-authorized_keys.erb'),
-	}
+  ssl::service { 'buildd.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
+
+  ssh::authorized_key_collect { 'buildd-master':
+    target_user => 'wb-buildd',
+    collect_tag => 'buildd_master',
+  }
 }