include signing from the ftp_master role

[mirror/dsa-puppet.git] / modules / roles / manifests / buildd_master.pp

diff --git a/modules/roles/manifests/buildd_master.pp b/modules/roles/manifests/buildd_master.pp
index 7767ed1..6b38620 100644 (file)
--- 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',
+  }
 }