On sparc, do not use https to buildd.d.o
authorPeter Palfrader <peter@palfrader.org>
Wed, 5 Aug 2015 06:10:59 +0000 (08:10 +0200)
committerPeter Palfrader <peter@palfrader.org>
Wed, 5 Aug 2015 06:11:12 +0000 (08:11 +0200)
modules/buildd/manifests/init.pp

index e168abc..5c6a301 100644 (file)
@@ -40,15 +40,14 @@ class buildd ($ensure=present) {
                default => 'wheezy'
        }
 
-       $buildd_apt_main_ensure = $::hostname ? {
-               /^(schroeder|sompek|stadler)$/ => 'absent',
-               default => 'present',
+       $buildd_apt_url = $::debarchitecture ? {
+               /^sparc$/ => 'http://buildd.debian.org/apt/',
+               default   => 'https://buildd.debian.org/apt/',
        }
 
        site::aptrepo { 'buildd.debian.org':
-               ensure     => $buildd_apt_main_ensure,
                key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
-               url        => 'https://buildd.debian.org/apt/',
+               url        => $buildd_apt_url,
                suite      => $suite,
                components => 'main',
                require    => Package['apt-transport-https'],