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 (file)
index 0000000..8c8dd2f
--- /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 78bf62c..4703bc8 100644 (file)
--- 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
        }