From 4c031bc2c3d1d6ddc9f2478bf9c68cffbb5e1d9e Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sat, 22 Jun 2019 14:19:31 +0200 Subject: [PATCH] All our buildds are running at least stretch, drop jessie specific code --- modules/buildd/manifests/init.pp | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index e5364cef8..29a35246a 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -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', -- 2.20.1