X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=780e1bda2fe4ceb8264c279abcbcdc99e15d9a3f;hb=148f8bf7c355fdea0d81a741202480fcfe5cdd32;hp=0e2aef3a672b2eab448ca4ce65c482f651d5b66c;hpb=f58b1cbe698b55e9639dc519fb42c73369a0b8d9;p=mirror%2Fdsa-puppet.git

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':