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

diff --git a/modules/roles/manifests/buildd_master.pp b/modules/roles/manifests/buildd_master.pp
index ba78ebf3f..6b386200c 100644
--- a/modules/roles/manifests/buildd_master.pp
+++ b/modules/roles/manifests/buildd_master.pp
@@ -1,6 +1,19 @@
 class roles::buildd_master {
-	apache2::site { '010-buildd.debian.org':
-		site   => 'buildd.debian.org',
-		source => 'puppet:///modules/roles/buildd_master/apache.conf'
-	}
+  include apache2
+  include roles::sso_rp
+
+  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',
+  }
 }