X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=4703bc86b276bad8a6160016ab75f33b0ee1b765;hb=ef9f1826ffec6284f4d3c85f562d875d594c8634;hp=7b22eae1e56ae1662c28e27d50911bb5bd97313a;hpb=03cbffa15f74f0aae25c7bc9b3e69b20b54926a0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 7b22eae1e..4703bc86b 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -30,7 +30,17 @@ class buildd ($ensure=present) {
 			source  => 'puppet:///modules/buildd/buildd.conf',
 			require => Package['buildd'],
 		}
-		site::linux_module { 'dm_snapshot': }
+		if ($::lsbmajdistrelease >= 8) {
+			file { '/etc/sbuild/sbuild.conf':
+				source  => 'puppet:///modules/buildd/sbuild.conf',
+				require => Package['sbuild'],
+			}
+		} else {
+			file { '/etc/sbuild/sbuild.conf':
+				source  => 'puppet:///modules/buildd/sbuild.conf.wheezy',
+				require => Package['sbuild'],
+			}
+		}
 		include ferm::ftp_conntrack
 	}
 
@@ -39,12 +49,11 @@ class buildd ($ensure=present) {
 	}
 
 	$suite = $::lsbdistcodename ? {
-		squeeze  => $::lsbdistcodename,
 		wheezy   => $::lsbdistcodename,
 		jessie   => $::lsbdistcodename,
 		stretch  => $::lsbdistcodename,
-		undef   => 'squeeze',
-		default => 'wheezy'
+		undef   => 'wheezy',
+		default => 'jessie'
 	}
 
 	$buildd_apt_url = $::debarchitecture ? {
@@ -95,7 +104,7 @@ class buildd ($ensure=present) {
 		require => Package['debian.org']
 	}
 
-	if ($::lsbmajdistrelease >= 7 and $::kernel == 'Linux') {
+	if ($::kernel == 'Linux') {
 		package { 'python-psutil':
 			ensure => installed,
 		}