X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=4703bc86b276bad8a6160016ab75f33b0ee1b765;hb=f372cc097f35cb6ff37a3f4cc0fdf74027fda896;hp=b58bd01d19c525ef4c7eb5a64408210013373284;hpb=d94208e70a3ca321373e1f4ba587afa82f919e8e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index b58bd01d1..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,
 		}
@@ -179,6 +188,17 @@ class buildd ($ensure=present) {
 		group   => buildd,
 		owner   => buildd,
 	}
+	file { '/home/buildd/.gnupg':
+		ensure  => directory,
+		mode    => '700',
+		group   => buildd,
+		owner   => buildd,
+	}
+	file { '/home/buildd/.gnupg/gpg.conf':
+		content  => "personal-digest-preferences SHA512\n",
+		group   => buildd,
+		owner   => buildd,
+	}
 
 	if ! $::buildd_key {
 		exec { 'create-buildd-key':