X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fbuildd_master.pp;h=d4d163ceb6969af7bb20d65d79a1e3eb0f82640f;hb=467347d5b49d336f7f6898a25a2dd0737e8c5b75;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..d4d163ceb 100644
--- a/modules/roles/manifests/buildd_master.pp
+++ b/modules/roles/manifests/buildd_master.pp
@@ -1,6 +1,11 @@
 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,
+  }
+
+  ssh::authorized_key_collect { 'buildd-master':
+    target_user => 'wb-buildd',
+    collect_tag => 'buildd_master',
+  }
 }