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

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