X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fschroot%2Fmanifests%2Finit.pp;h=ee24dc2da18f06bd4d9401c4518192c7be1621ff;hb=9d0250cb427297aaf7ce598f42373398fbc5085c;hp=1716fbbed93979480d5d7a6ea7742feee9bfd1ab;hpb=2d41a8963f7303b6a78a5432658ce7e93b145cce;p=mirror%2Fdsa-puppet.git

diff --git a/modules/schroot/manifests/init.pp b/modules/schroot/manifests/init.pp
index 1716fbbed..ee24dc2da 100644
--- a/modules/schroot/manifests/init.pp
+++ b/modules/schroot/manifests/init.pp
@@ -1,4 +1,6 @@
 class schroot {
+	$mirror = lookup('apt::sources::debian::location', { 'merge' => { 'strategy' => 'first'}} )
+
 	package { 'schroot':
 		ensure => installed,
 		tag    => extra_repo,
@@ -33,6 +35,11 @@ class schroot {
 		source  => 'puppet:///modules/schroot/schroot-setup.d/99porterbox-extra-sources',
 		require => Package['schroot'],
 	}
+	file { '/etc/schroot/setup.d/99builddsourceslist':
+		mode    => '0555',
+		source  => 'puppet:///modules/schroot/schroot-setup.d/99builddsourceslist',
+		require => Package['schroot'],
+	}
 
 	file { '/usr/local/sbin/setup-dchroot':
 		mode    => '0555',
@@ -48,7 +55,9 @@ class schroot {
 		require => Package['schroot'],
 	}
 	file { '/etc/schroot/dsa/default-mirror':
-		content => template('schroot/default-mirror.erb'),
+		content => @("EOT"),
+			$mirror
+			| EOT
 	}
 	file { '/etc/schroot/dsa/config':
 		source  => 'puppet:///modules/schroot/schroot-dsa/config',
@@ -65,7 +74,7 @@ class schroot {
 
 	if $has_srv_buildd {
 		file { '/etc/schroot/buildd/config':
-			content => "CHROOT_FILE_UNPACK_DIR=/srv/buildd/unpack",
+			content => "CHROOT_FILE_UNPACK_DIR=/srv/buildd/unpack\n",
 			require => Package['schroot'],
 		}
 	}