X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fbuildd_master.pp;h=7767ed132aa313aff7ef76677c3b4484b1bfeaf3;hb=0a5b5cce3089ae780a23c11849ef470f6df1567e;hp=88bd157e7b75b77db0baa52946127bd975e51612;hpb=3e7022d4137ec1f484e1106fb8cca130af45540b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/buildd_master.pp b/modules/roles/manifests/buildd_master.pp
index 88bd157e7..7767ed132 100644
--- a/modules/roles/manifests/buildd_master.pp
+++ b/modules/roles/manifests/buildd_master.pp
@@ -1,8 +1,10 @@
 class roles::buildd_master {
-	include apache2::macro
+	ssl::service { 'buildd.debian.org':
+		notify  => Exec['service apache2 reload'],
+		key => true,
+	}
 
-	apache2::site { '010-buildd.debian.org':
-		site   => 'buildd.debian.org',
-		source => 'puppet:///modules/roles/buildd_master/apache.conf'
+	file { '/etc/ssh/userkeys/wb-buildd.more':
+		content => template('roles/buildd_master_wb-authorized_keys.erb'),
 	}
 }