X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fbuildd_master.pp;h=6b386200ccbc37e0b1ccb023ef5a0b4cefd71543;hb=a052fbf257fdb9c5e604486f61ed80127a78fc31;hp=90e3810d8dafd956d5ef8b940c2bd9ce2f72133f;hpb=232d0deecdefbaa558bd72a822967257a86d0160;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/buildd_master.pp b/modules/roles/manifests/buildd_master.pp
index 90e3810d8..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'],
-		tlsaport => 0,
-	}
+  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',
+  }
 }