From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 21 May 2013 20:08:57 +0000 (+0000)
Subject: Make sure we remove proposed/experimental buildd repo when not in the list
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c18af503e88887835256ea6558439ada751761d1;p=mirror%2Fdsa-puppet.git

Make sure we remove proposed/experimental buildd repo when not in the list
---

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index ec575bf84..da13c77c6 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -46,22 +46,26 @@ class buildd ($ensure=present) {
 		require    => Package['apt-transport-https'],
 	}
 
-	if $::hostname in [alkman,porpora,zandonai] {
-		site::aptrepo { 'buildd.debian.org-proposed':
-			url        => 'https://buildd.debian.org/apt/',
-			suite      => "${suite}-proposed",
-			components => 'main',
-			require    => Package['apt-transport-https'],
-		}
+	site::aptrepo { 'buildd.debian.org-proposed':
+		ensure     => $::hostname ? {
+		                             /^(alkman|porpora|zandonai)$/ => 'present',
+		                             default => 'absent',
+		                            },
+		url        => 'https://buildd.debian.org/apt/',
+		suite      => "${suite}-proposed",
+		components => 'main',
+		require    => Package['apt-transport-https'],
 	}
 
-	if $::hostname in [krenek] {
-		site::aptrepo { 'buildd.debian.org-experimental':
-			url        => 'https://buildd.debian.org/apt/',
-			suite      => "${suite}-experimental",
-			components => 'main',
-			require    => Package['apt-transport-https'],
-		}
+	site::aptrepo { 'buildd.debian.org-experimental':
+		ensure     => $::hostname ? {
+		                             /^(krenek)$/ => 'present',
+		                             default => 'absent',
+		                            },
+		url        => 'https://buildd.debian.org/apt/',
+		suite      => "${suite}-experimental",
+		components => 'main',
+		require    => Package['apt-transport-https'],
 	}
 
 	# 'bad' extension