buildds: disable buildd.d.o repository on stretch hosts
authorAurelien Jarno <aurelien@aurel32.net>
Tue, 27 Jun 2017 10:06:53 +0000 (12:06 +0200)
committerAurelien Jarno <aurelien@aurel32.net>
Tue, 27 Jun 2017 10:06:53 +0000 (12:06 +0200)
Stretch hosts directly use the sbuild and buildd packages from the
debian archive.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
modules/buildd/manifests/init.pp

index f821eac..a5db827 100644 (file)
@@ -50,12 +50,18 @@ class buildd ($ensure=present) {
                        default => 'jessie'
                }
 
-               site::aptrepo { 'buildd.debian.org':
-                       key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
-                       url        => 'https://apt.buildd.debian.org/',
-                       suite      => $suite,
-                       components => 'main',
-                       require    => Package['apt-transport-https'],
+               if (versioncmp($::lsbmajdistrelease, '9') >= 0) {
+                       site::aptrepo { 'buildd.debian.org':
+                               ensure => absent,
+                       }
+               } else {
+                       site::aptrepo { 'buildd.debian.org':
+                               key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
+                               url        => 'https://apt.buildd.debian.org/',
+                               suite      => $suite,
+                               components => 'main',
+                               require    => Package['apt-transport-https'],
+                       }
                }
 
                file { '/etc/apt/apt.conf.d/puppet-https-buildd':