All our buildds are running at least stretch, drop jessie specific code
authorAurelien Jarno <aurelien@aurel32.net>
Sat, 22 Jun 2019 12:19:31 +0000 (14:19 +0200)
committerAurelien Jarno <aurelien@aurel32.net>
Sat, 22 Jun 2019 12:19:31 +0000 (14:19 +0200)
modules/buildd/manifests/init.pp

index e5364ce..29a3524 100644 (file)
@@ -216,29 +216,6 @@ class buildd ($ensure=present) {
                                require => Package['buildd'],
                        }
 
-                       if (versioncmp($::lsbmajdistrelease, '9') >= 0) {
-                               site::aptrepo { 'buildd.debian.org':
-                                       ensure => absent,
-                               }
-                               file { '/etc/apt/apt.conf.d/puppet-https-buildd':
-                                       ensure => absent,
-                               }
-                       } else {
-                               package { 'apt-transport-https':
-                                       ensure => installed,
-                               }
-                               site::aptrepo { 'buildd.debian.org':
-                                       key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
-                                       url        => 'https://apt.buildd.debian.org/',
-                                       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",
-                               }
-                       }
-
                        concat::fragment { 'dsa-puppet-stuff--buildd':
                                target => '/etc/cron.d/dsa-puppet-stuff',
                                source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',