X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=f821eac746d837366076199dfc8220f3750cf3e3;hb=337969ae31de67c96cac0ab1877038bb3ccb585b;hp=8b6514eeb1ec4f1fbbc00d3badbeb0822c27f3cd;hpb=7f69dbd9fd772b61783ed21262af68f714fb0246;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 8b6514eeb..f821eac74 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -31,16 +31,9 @@ class buildd ($ensure=present) {
 				source  => 'puppet:///modules/buildd/buildd.conf',
 				require => Package['buildd'],
 			}
-			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'],
-				}
+			file { '/etc/sbuild/sbuild.conf':
+				source  => 'puppet:///modules/buildd/sbuild.conf',
+				require => Package['sbuild'],
 			}
 			include ferm::ftp_conntrack
 		}
@@ -85,16 +78,9 @@ class buildd ($ensure=present) {
 			package { 'python-psutil':
 				ensure => installed,
 			}
-			if ($::lsbmajdistrelease >= 8) {
-				file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
-					source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill',
-					mode    => '0555',
-				}
-			} else {
-				file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
-					source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill.wheezy',
-					mode    => '0555',
-				}
+			file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
+				source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill',
+				mode    => '0555',
 			}
 		} else {
 			file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
@@ -107,7 +93,7 @@ class buildd ($ensure=present) {
 		}
 
 		service { 'buildd':
-			enable = false,
+			enable => false,
 			ensure => 'stopped',
 		}