From: Peter Palfrader Date: Wed, 5 Aug 2015 06:10:59 +0000 (+0200) Subject: On sparc, do not use https to buildd.d.o X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=da8a7eb05b5529b0a7d9bd18b2d8340e08523224 On sparc, do not use https to buildd.d.o --- diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index e168abc3..5c6a3019 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -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'],