X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fautofs%2Fmanifests%2Fbytemark.pp;h=f1bb8879dc019b485ff87438a170ba4c9e1d2da4;hb=689a1da09e35835d4f266891eb30182a5d6b6018;hp=d52a4587829ed8cd36bb4d90e7e456f3c852351d;hpb=0e4d2cbe94f4aeeb43933ca02ef5841a33d5a8ec;p=mirror%2Fdsa-puppet.git

diff --git a/modules/autofs/manifests/bytemark.pp b/modules/autofs/manifests/bytemark.pp
index d52a45878..f1bb8879d 100644
--- a/modules/autofs/manifests/bytemark.pp
+++ b/modules/autofs/manifests/bytemark.pp
@@ -1,18 +1,6 @@
 class autofs::bytemark {
-	package { 'autofs': ensure => installed }
-	package { 'nfs-common': ensure => installed }
+	include autofs::common
 
-	exec { 'autofs reload':
-		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-		command     => 'service autofs reload',
-		refreshonly => true,
-		require =>  Package['autofs'],
-	}
-
-
-	file { '/etc/auto.master.d':
-		ensure  => directory
-	}
 	file { '/etc/auto.master.d/dsa.autofs':
 		source  => "puppet:///modules/autofs/bytemark/auto.master.d-dsa.autofs",
 		notify  => Exec['autofs reload']
@@ -24,6 +12,9 @@ class autofs::bytemark {
 
 	file { '/srv/mirrors': ensure  => directory }
 	file { '/srv/mirrors/debian': ensure  => '/auto.dsa/debian' }
-	file { '/srv/mirrors/debian-backports': ensure  => '/auto.dsa/debian-backports' }
+	file { '/srv/mirrors/debian-backports': ensure  => absent }
+	file { '/srv/mirrors/debian-debug': ensure  => '/auto.dsa/debian-debug' }
+	file { '/srv/mirrors/debian-ports': ensure  => '/auto.dsa/debian-ports' }
 	file { '/srv/mirrors/debian-security': ensure  => '/auto.dsa/debian-security' }
+	file { '/srv/mirrors/debian-buildd': ensure  => '/auto.dsa/incoming.debian.org/cur/debian-buildd' }
 }