X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdakmaster.pp;h=fd3d091e4ee0bfbe68e87cd9ffdba5bcebe669c1;hb=e36aaa15b6e11c42c1f2fd23c28acbaae55a0355;hp=08a148192c51810ca6901b2ad6b412e02c77f914;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/dakmaster.pp b/modules/roles/manifests/dakmaster.pp
index 08a148192..fd3d091e4 100644
--- a/modules/roles/manifests/dakmaster.pp
+++ b/modules/roles/manifests/dakmaster.pp
@@ -1,13 +1,7 @@
+# This class is included by all the *master services
+# that run dak, like ftp-master and security-master.
 class roles::dakmaster {
-
-	package { 'libapache2-mod-macro':
-		ensure => installed,
-	}
-
-	apache2::module { 'macro': }
-
-	apache2::config { 'puppet-builddlist':
-		template => 'roles/conf-builddlist.erb',
-	}
-
+  apache2::config { 'puppet-builddlist':
+    content => template('roles/dakmaster/conf-builddlist.erb'),
+  }
 }