From 711cc08d584f924ae22d242ef532b8d5110ecb27 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sat, 23 Apr 2016 19:47:12 +0200 Subject: [PATCH] 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 --- modules/buildd/files/sbuild.conf.wheezy | 4 ++++ modules/buildd/manifests/init.pp | 13 ++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 modules/buildd/files/sbuild.conf.wheezy 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 } -- 2.20.1