X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fschroot%2Fmanifests%2Finit.pp;h=ee24dc2da18f06bd4d9401c4518192c7be1621ff;hb=598ef097f4c8f6b50b61dde7fc4bd011e955b754;hp=14bb914552a96e150431fddbb165931681569ec8;hpb=55ed415b6398274a31f9b770c15a946b25116975;p=mirror%2Fdsa-puppet.git

diff --git a/modules/schroot/manifests/init.pp b/modules/schroot/manifests/init.pp
index 14bb91455..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,12 +35,10 @@ class schroot {
 		source  => 'puppet:///modules/schroot/schroot-setup.d/99porterbox-extra-sources',
 		require => Package['schroot'],
 	}
-	if ($::lsbmajdistrelease >= 8) {
-		file { '/etc/schroot/setup.d/99builddsourceslist':
-			mode    => '0555',
-			source  => 'puppet:///modules/schroot/schroot-setup.d/99builddsourceslist',
-			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':
@@ -55,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',