buildd: drop old compat code, make more jessie code conditional

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 4b8e397..7fc00c5 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -13,9 +13,6 @@ class buildd ($ensure=present) {
                        before => Package['sbuild']
                }
 
-               package { 'apt-transport-https':
-                       ensure => installed,
-               }
                if $ensure == present {
                        package { 'dupload':
                                ensure => installed,
@@ -38,43 +35,26 @@ class buildd ($ensure=present) {
                        include ferm::ftp_conntrack
                }
 
-               site::aptrepo { 'buildd':
-                       ensure => absent,
-               }
-
-               $suite = $::lsbdistcodename ? {
-                       wheezy   => $::lsbdistcodename,
-                       jessie   => $::lsbdistcodename,
-                       stretch  => $::lsbdistcodename,
-                       undef   => 'wheezy',
-                       default => 'jessie'
-               }
-
                if (versioncmp($::lsbmajdistrelease, '9') >= 0) {
                        site::aptrepo { 'buildd.debian.org':
                                ensure => absent,
                        }
+                       file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+                               ensure => absent,
+                       }
                } else {
                        site::aptrepo { 'buildd.debian.org':
                                key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
                                url        => 'https://apt.buildd.debian.org/',
-                               suite      => $suite,
+                               suite      => 'jessie',
                                components => 'main',
                                require    => Package['apt-transport-https'],
                        }
+                       file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+                               content => "Acquire::https::apt.buildd.debian.org::CaInfo \"/etc/ssl/ca-debian/ca-certificates.crt\";\n",
+                       }
                }
 
-               file { '/etc/apt/apt.conf.d/puppet-https-buildd':
-                       content => "Acquire::https::apt.buildd.debian.org::CaInfo \"/etc/ssl/ca-debian/ca-certificates.crt\";\n",
-               }
-
-               # 'bad' extension
-               file { '/etc/apt/preferences.d/buildd.debian.org':
-                       ensure => absent,
-               }
-               file { '/etc/apt/preferences.d/buildd':
-                       ensure => absent,
-               }
                file { '/etc/cron.d/dsa-buildd': ensure => absent, }
                concat::fragment { 'dsa-puppet-stuff--buildd':
                        target => '/etc/cron.d/dsa-puppet-stuff',