From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat, 23 Apr 2016 17:47:12 +0000 (+0200)
Subject: buildd: ship a different sbuild.conf for wheezy hosts
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=711cc08d584f924ae22d242ef532b8d5110ecb27;p=mirror%2Fdsa-puppet.git

buildd: ship a different sbuild.conf for wheezy hosts

Otherwise the wheezy sbuild version chokes on the aspcud_criteria
configuration variable.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/modules/buildd/files/sbuild.conf.wheezy b/modules/buildd/files/sbuild.conf.wheezy
new file mode 100644
index 000000000..8c8dd2f2e
--- /dev/null
+++ b/modules/buildd/files/sbuild.conf.wheezy
@@ -0,0 +1,4 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 78bf62c85..4703bc86b 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -30,9 +30,16 @@ class buildd ($ensure=present) {
 			source  => 'puppet:///modules/buildd/buildd.conf',
 			require => Package['buildd'],
 		}
-		file { '/etc/sbuild/sbuild.conf':
-			source  => 'puppet:///modules/buildd/sbuild.conf',
-			require => Package['sbuild'],
+		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
 	}