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

diff --git a/modules/roles/manifests/buildd_master.pp b/modules/roles/manifests/buildd_master.pp
index 7fe104391..6b386200c 100644
--- a/modules/roles/manifests/buildd_master.pp
+++ b/modules/roles/manifests/buildd_master.pp
@@ -1,10 +1,19 @@
 class roles::buildd_master {
+  include apache2
+  include roles::sso_rp
+
   ssl::service { 'buildd.debian.org':
-    notify  => Exec['service apache2 reload'],
-    key => true,
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
+
+  ssh::authorized_key_collect { 'buildd-master':
+    target_user => 'wb-buildd',
+    collect_tag => 'buildd_master',
   }
 
-  file { '/etc/ssh/userkeys/wb-buildd.more':
-    content => template('roles/buildd_master_wb-authorized_keys.erb'),
+  exim::vdomain { 'buildd.debian.org':
+    owner => 'wbadm',
+    group => 'wbadm',
   }
 }