X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fbuildd_master.pp;h=6b386200ccbc37e0b1ccb023ef5a0b4cefd71543;hb=7b5f8bd99839bcbd9080209121f58f9aee5a9831;hp=7767ed132aa313aff7ef76677c3b4484b1bfeaf3;hpb=2b0d83fb0bc4c70ab3d6c49169e7f8c6031ee8b1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/buildd_master.pp b/modules/roles/manifests/buildd_master.pp
index 7767ed132..6b386200c 100644
--- a/modules/roles/manifests/buildd_master.pp
+++ b/modules/roles/manifests/buildd_master.pp
@@ -1,10 +1,19 @@
 class roles::buildd_master {
-	ssl::service { 'buildd.debian.org':
-		notify  => Exec['service apache2 reload'],
-		key => true,
-	}
+  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',
+  }
+
+  exim::vdomain { 'buildd.debian.org':
+    owner => 'wbadm',
+    group => 'wbadm',
+  }
 }