From 7625d4a83452efc6467fa79a65b5030d42bd547a Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sat, 25 Jun 2016 17:13:02 +0200 Subject: [PATCH] alkman has been decommissioned for a lot of time already Also drop code that was only used by it. Signed-off-by: Aurelien Jarno --- modules/buildd/manifests/init.pp | 13 ------------- modules/debian-org/misc/local.yaml | 1 - 2 files changed, 14 deletions(-) diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index 0e2aef3a6..780e1bda2 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -70,11 +70,6 @@ class buildd ($ensure=present) { require => Package['apt-transport-https'], } - $buildd_prop_ensure = $::hostname ? { - /^(alkman)$/ => 'present', - default => 'absent', - } - if ($::lsbmajdistrelease >= 8) { file { '/etc/apt/apt.conf.d/puppet-https-buildd': content => "Acquire::https::buildd.debian.org::CaInfo \"/etc/ssl/ca-debian/ca-certificates.crt\";\n", @@ -84,14 +79,6 @@ class buildd ($ensure=present) { content => "Acquire::https::buildd.debian.org::CaInfo \"/etc/ssl/servicecerts/buildd.debian.org.crt\";\n", } } - site::aptrepo { 'buildd.debian.org-proposed': - ensure => $buildd_prop_ensure, - url => 'https://buildd.debian.org/apt/', - suite => "${suite}-proposed", - components => 'main', - require => [ Package['apt-transport-https'], - File['/etc/apt/apt.conf.d/puppet-https-buildd'] ], - } # 'bad' extension file { '/etc/apt/preferences.d/buildd.debian.org': diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index 8391bc085..405a56875 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -184,7 +184,6 @@ host_settings: - smetana.debian.org - zelenka.debian.org # buildd - - alkman.debian.org - antheil.debian.org - arm-arm-01.debian.org - arm-arm-02.debian.org -- 2.20.1