X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fbuildd_master.pp;h=7767ed132aa313aff7ef76677c3b4484b1bfeaf3;hb=acd1de8f69a30e3a07fcb5dad44f980dd8bd89a3;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..7767ed132 100644
--- a/modules/roles/manifests/buildd_master.pp
+++ b/modules/roles/manifests/buildd_master.pp
@@ -1,6 +1,10 @@
 class roles::buildd_master {
-	apache2::site { '010-buildd.debian.org':
-		site   => 'buildd.debian.org',
-		source => 'puppet:///modules/roles/buildd_master/apache.conf'
+	ssl::service { 'buildd.debian.org':
+		notify  => Exec['service apache2 reload'],
+		key => true,
+	}
+
+	file { '/etc/ssh/userkeys/wb-buildd.more':
+		content => template('roles/buildd_master_wb-authorized_keys.erb'),
 	}
 }