From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 12 Jul 2014 14:06:08 +0000 (+0200)
Subject: Disable proposed-updates
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8e78289d3489d8d202c421215e3f9a1ea31d0a59;p=mirror%2Fdsa-puppet.git

Disable proposed-updates
---

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index bc965ae8a..2341b8586 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -145,18 +145,18 @@ class debian-org {
 		components => ['main','contrib','non-free']
 	}
 
-	if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem, pettersson]) or
-	   ($::hoster and ($::hoster in [bytemark, man-da, brown])) {
-		site::aptrepo { 'proposed-updates':
-			url        => $mirror,
-			suite      => "${::lsbdistcodename}-proposed-updates",
-			components => ['main','contrib','non-free']
-		}
-	} else {
+	#if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem, pettersson]) or
+	#   ($::hoster and ($::hoster in [bytemark, man-da, brown])) {
+	#	site::aptrepo { 'proposed-updates':
+	#		url        => $mirror,
+	#		suite      => "${::lsbdistcodename}-proposed-updates",
+	#		components => ['main','contrib','non-free']
+	#	}
+	#} else {
 		site::aptrepo { 'proposed-updates':
 			ensure => absent,
 		}
-	}
+	#}
 
 	site::aptrepo { 'debian.org':
 		ensure => absent,