X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fautofs%2Fmanifests%2Fbytemark.pp;h=11998b57aa88c90d7b46aef88cae11b029a561d8;hb=3671d653db6d66ce70d350cc4440af9602ab99c6;hp=2604f81eb699e7bc6a823e73c98ed5b66e65294a;hpb=6ce6e2df93868184358715b1cf5d5b7348bee319;p=mirror%2Fdsa-puppet.git

diff --git a/modules/autofs/manifests/bytemark.pp b/modules/autofs/manifests/bytemark.pp
index 2604f81eb..11998b57a 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']
@@ -21,4 +9,11 @@ class autofs::bytemark {
 		source  => "puppet:///modules/autofs/bytemark/auto.dsa",
 		notify  => Exec['autofs reload']
 	}
+
+	file { '/srv/mirrors': ensure  => directory }
+	file { '/srv/mirrors/debian': ensure  => '/auto.dsa/debian' }
+	file { '/srv/mirrors/debian-backports': ensure  => absent }
+	file { '/srv/mirrors/debian-debug': ensure  => '/auto.dsa/debian-debug' }
+	file { '/srv/mirrors/debian-security': ensure  => '/auto.dsa/debian-security' }
+	file { '/srv/mirrors/debian-buildd': ensure  => '/auto.dsa/incoming.debian.org/cur/debian-buildd' }
 }